diff options
author | Doris Ling <dling@google.com> | 2016-10-17 20:31:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-17 20:31:49 +0000 |
commit | 99238ff174cebc212724729a06252837cbf6d21c (patch) | |
tree | fbdb4bbe8f7431f64f79f6b8379ab257d73b3b1e /src/com/android/settings/gestures/GestureSettings.java | |
parent | 1aa65f3b925ca89fb6789ef12c0eea93102fdc0f (diff) | |
parent | fccee6adae5019061988f709cb6382550fbfae55 (diff) | |
download | packages_apps_Settings-99238ff174cebc212724729a06252837cbf6d21c.tar.gz packages_apps_Settings-99238ff174cebc212724729a06252837cbf6d21c.tar.bz2 packages_apps_Settings-99238ff174cebc212724729a06252837cbf6d21c.zip |
Add static preview images to gesture settings. am: 12e4bebabf am: df7b815980
am: fccee6adae
Change-Id: Ia745f80fa47a7316cb462918f900de001b1ecf03
Diffstat (limited to 'src/com/android/settings/gestures/GestureSettings.java')
-rw-r--r-- | src/com/android/settings/gestures/GestureSettings.java | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index 22cc496123..ad9955cfbf 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -56,11 +56,6 @@ public class GestureSettings extends SettingsPreferenceFragment implements private static final String PREF_KEY_SWIPE_DOWN_FINGERPRINT = "gesture_swipe_down_fingerprint"; private static final String PREF_KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen"; private static final String DEBUG_DOZE_COMPONENT = "debug.doze.component"; - private static final int PREF_ID_DOUBLE_TAP_POWER = 0; - private static final int PREF_ID_DOUBLE_TWIST = 1; - private static final int PREF_ID_PICK_UP = 2; - private static final int PREF_ID_SWIPE_DOWN_FINGERPRINT = 3; - private static final int PREF_ID_DOUBLE_TAP_SCREEN = 4; private List<GesturePreference> mPreferences; @@ -75,7 +70,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements if (isCameraDoubleTapPowerGestureAvailable(getResources())) { int cameraDisabled = Secure.getInt( getContentResolver(), Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0); - addPreference(PREF_KEY_DOUBLE_TAP_POWER, cameraDisabled == 0, PREF_ID_DOUBLE_TAP_POWER); + addPreference(PREF_KEY_DOUBLE_TAP_POWER, cameraDisabled == 0); } else { removePreference(PREF_KEY_DOUBLE_TAP_POWER); } @@ -84,21 +79,20 @@ public class GestureSettings extends SettingsPreferenceFragment implements boolean dozeEnabled = isDozeAvailable(context); if (dozeEnabled && isPickupAvailable(context)) { int pickup = Secure.getInt(getContentResolver(), Secure.DOZE_PULSE_ON_PICK_UP, 1); - addPreference(PREF_KEY_PICK_UP, pickup != 0, PREF_ID_PICK_UP); + addPreference(PREF_KEY_PICK_UP, pickup != 0); } else { removePreference(PREF_KEY_PICK_UP); } if (dozeEnabled && isDoubleTapAvailable(context)) { int doubleTap = Secure.getInt(getContentResolver(), Secure.DOZE_PULSE_ON_DOUBLE_TAP, 1); - addPreference(PREF_KEY_DOUBLE_TAP_SCREEN, doubleTap != 0, PREF_ID_DOUBLE_TAP_SCREEN); + addPreference(PREF_KEY_DOUBLE_TAP_SCREEN, doubleTap != 0); } else { removePreference(PREF_KEY_DOUBLE_TAP_SCREEN); } // Fingerprint slide for notifications if (isSystemUINavigationAvailable(context)) { - addPreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT, isSystemUINavigationEnabled(context), - PREF_ID_SWIPE_DOWN_FINGERPRINT); + addPreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT, isSystemUINavigationEnabled(context)); } else { removePreference(PREF_KEY_SWIPE_DOWN_FINGERPRINT); } @@ -107,7 +101,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements if (isDoubleTwistAvailable(context)) { int doubleTwistEnabled = Secure.getInt( getContentResolver(), Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1); - addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0, PREF_ID_DOUBLE_TWIST); + addPreference(PREF_KEY_DOUBLE_TWIST, doubleTwistEnabled != 0); } else { removePreference(PREF_KEY_DOUBLE_TWIST); } @@ -234,11 +228,10 @@ public class GestureSettings extends SettingsPreferenceFragment implements R.bool.config_gesture_double_tap_settings_enabled); } - private void addPreference(String key, boolean enabled, int id) { + private void addPreference(String key, boolean enabled) { GesturePreference preference = (GesturePreference) findPreference(key); preference.setChecked(enabled); preference.setOnPreferenceChangeListener(this); - preference.loadPreview(getLoaderManager(), id); mPreferences.add(preference); } |