diff options
| author | OrdenKrieger <OrdenKriegerEDR@googlemail.com> | 2017-01-11 20:14:07 +0100 |
|---|---|---|
| committer | davidevinavil <davidevinavil@gmail.com> | 2017-01-14 15:52:08 +0100 |
| commit | 532f2d7a892c74532bd46e33b94e9828593350e6 (patch) | |
| tree | ce978208ae8b57f8c5f86bd1f3bb5147db6b68bd /doze/src | |
| parent | 5455825abd8be4e1bc2e8adbbfbf954016763488 (diff) | |
z2_plus: LineageOS upstream
*doze: Commonize strings translations
*op3: Bring DozeSettings up to date
Diffstat (limited to 'doze/src')
4 files changed, 7 insertions, 7 deletions
diff --git a/doze/src/com/cyanogenmod/settings/doze/BootCompletedReceiver.java b/doze/src/com/cyanogenmod/settings/doze/BootCompletedReceiver.java index e1b2b50..2283575 100644 --- a/doze/src/com/cyanogenmod/settings/doze/BootCompletedReceiver.java +++ b/doze/src/com/cyanogenmod/settings/doze/BootCompletedReceiver.java @@ -24,7 +24,7 @@ import android.util.Log; public class BootCompletedReceiver extends BroadcastReceiver { private static final boolean DEBUG = false; - private static final String TAG = "ZukDoze"; + private static final String TAG = "OneplusDoze"; @Override public void onReceive(final Context context, Intent intent) { diff --git a/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java b/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java index 87f61ce..6ab3e0d 100644 --- a/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java +++ b/doze/src/com/cyanogenmod/settings/doze/DozeReceiver.java @@ -24,7 +24,7 @@ import cyanogenmod.preference.RemotePreferenceUpdater; public class DozeReceiver extends RemotePreferenceUpdater { private static final boolean DEBUG = false; - private static final String TAG = "ZukDoze"; + private static final String TAG = "OneplusDoze"; private static final String DOZE_CATEGORY_KEY = "doze_device_settings"; diff --git a/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java b/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java index ec1c9d8..0da6f69 100644 --- a/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java +++ b/doze/src/com/cyanogenmod/settings/doze/DozeSettingsFragment.java @@ -93,7 +93,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer } mPickUpPreference = - (SwitchPreference) findPreference(Utils.PICK_UP_KEY); + (SwitchPreference) findPreference(Utils.GESTURE_PICK_UP_KEY); mPickUpPreference.setOnPreferenceChangeListener(this); mHandwavePreference = @@ -147,7 +147,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer public boolean onPreferenceChange(Preference preference, Object newValue) { final String key = preference.getKey(); final boolean value = (Boolean) newValue; - if (Utils.PICK_UP_KEY.equals(key)) { + if (Utils.GESTURE_PICK_UP_KEY.equals(key)) { mPickUpPreference.setChecked(value); } else if (Utils.GESTURE_HAND_WAVE_KEY.equals(key)) { mHandwavePreference.setChecked(value); @@ -172,7 +172,7 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer return new AlertDialog.Builder(getActivity()) .setTitle(R.string.doze_settings_help_title) .setMessage(R.string.doze_settings_help_text) - .setNegativeButton(R.string.dlg_ok, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.dialog_ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.cancel(); diff --git a/doze/src/com/cyanogenmod/settings/doze/Utils.java b/doze/src/com/cyanogenmod/settings/doze/Utils.java index 585ccbf..ef22157 100644 --- a/doze/src/com/cyanogenmod/settings/doze/Utils.java +++ b/doze/src/com/cyanogenmod/settings/doze/Utils.java @@ -34,7 +34,7 @@ public final class Utils { private static final String DOZE_INTENT = "com.android.systemui.doze.pulse"; protected static final String AMBIENT_DISPLAY_KEY = "doze_enabled"; - protected static final String PICK_UP_KEY = "pick_up"; + protected static final String GESTURE_PICK_UP_KEY = "gesture_pick_up"; protected static final String GESTURE_HAND_WAVE_KEY = "gesture_hand_wave"; protected static final String GESTURE_POCKET_KEY = "gesture_pocket"; @@ -74,7 +74,7 @@ public final class Utils { protected static boolean pickUpEnabled(Context context) { return PreferenceManager.getDefaultSharedPreferences(context) - .getBoolean(PICK_UP_KEY, false); + .getBoolean(GESTURE_PICK_UP_KEY, false); } protected static boolean handwaveGestureEnabled(Context context) { |