diff options
Diffstat (limited to 'doze')
| -rw-r--r-- | doze/res/xml/gesture_panel.xml | 10 | ||||
| -rw-r--r-- | doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java | 39 |
2 files changed, 7 insertions, 42 deletions
diff --git a/doze/res/xml/gesture_panel.xml b/doze/res/xml/gesture_panel.xml index f911378..47ff26e 100644 --- a/doze/res/xml/gesture_panel.xml +++ b/doze/res/xml/gesture_panel.xml @@ -20,8 +20,8 @@ android:key="ambient_display_key" android:title="@string/ambient_display_title"> - <SwitchPreference - android:key="ambient_display_enable" + <cyanogenmod.preference.SecureSettingSwitchPreference + android:key="doze_enabled" android:defaultValue="true" android:title="@string/ambient_display_enable_title" android:summary="@string/ambient_display_enable_summary" /> @@ -30,13 +30,15 @@ android:key="gesture_hand_wave" android:defaultValue="false" android:title="@string/hand_wave_gesture_title" - android:summary="@string/hand_wave_gesture_summary" /> + android:summary="@string/hand_wave_gesture_summary" + android:dependency="doze_enabled" /> <SwitchPreference android:key="gesture_pocket" android:defaultValue="false" android:title="@string/pocket_gesture_title" - android:summary="@string/pocket_gesture_summary" /> + android:summary="@string/pocket_gesture_summary" + android:dependency="doze_enabled" /> </PreferenceCategory> <PreferenceCategory diff --git a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java index c9ffce0..9256afe 100644 --- a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java +++ b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java @@ -26,32 +26,19 @@ import org.cyanogenmod.internal.util.ScreenType; public class TouchscreenGestureSettings extends PreferenceFragment { - private static final String KEY_AMBIENT_DISPLAY_ENABLE = "ambient_display_enable"; private static final String KEY_HAND_WAVE = "gesture_hand_wave"; - private static final String KEY_GESTURE_POCKET = "gesture_pocket"; private static final String KEY_PROXIMITY_WAKE = "proximity_wake_enable"; - private SwitchPreference mAmbientDisplayPreference; private SwitchPreference mHandwavePreference; - private SwitchPreference mPocketPreference; private SwitchPreference mProximityWakePreference; @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.gesture_panel); - boolean dozeEnabled = isDozeEnabled(); - mAmbientDisplayPreference = - (SwitchPreference) findPreference(KEY_AMBIENT_DISPLAY_ENABLE); - // Read from DOZE_ENABLED secure setting - mAmbientDisplayPreference.setChecked(dozeEnabled); - mAmbientDisplayPreference.setOnPreferenceChangeListener(mAmbientDisplayPrefListener); + mHandwavePreference = (SwitchPreference) findPreference(KEY_HAND_WAVE); - mHandwavePreference.setEnabled(dozeEnabled); mHandwavePreference.setOnPreferenceChangeListener(mProximityListener); - mPocketPreference = - (SwitchPreference) findPreference(KEY_GESTURE_POCKET); - mPocketPreference.setEnabled(dozeEnabled); mProximityWakePreference = (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); mProximityWakePreference.setOnPreferenceChangeListener(mProximityListener); @@ -67,30 +54,6 @@ public class TouchscreenGestureSettings extends PreferenceFragment { } } - private boolean enableDoze(boolean enable) { - return Settings.Secure.putInt(getContext().getContentResolver(), - Settings.Secure.DOZE_ENABLED, enable ? 1 : 0); - } - - private boolean isDozeEnabled() { - return Settings.Secure.getInt(getContext().getContentResolver(), - Settings.Secure.DOZE_ENABLED, 1) != 0; - } - - private Preference.OnPreferenceChangeListener mAmbientDisplayPrefListener = - new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - boolean enable = (boolean) newValue; - boolean ret = enableDoze(enable); - if (ret) { - mHandwavePreference.setEnabled(enable); - mPocketPreference.setEnabled(enable); - } - return ret; - } - }; - private Preference.OnPreferenceChangeListener mProximityListener = new Preference.OnPreferenceChangeListener() { @Override |