commit 35149f4dde7f07de1be6c3239eeef982d46b4c98
author Christopher R. Palmer <crpalmer@gmail.com> Sat May 23 12:49:33 2015 +0200
committer neohackt <tapan15in@gmail.com> Wed May 27 19:10:39 2015 +0200
tree 4b9b85b7d8fe44eda5c9191e7781f863193ad8cd
parent 8a29158308b6fa19a5adc09cd452be8f9f9096ce

msm8226-common: doze: Disable doze settings when doze disabled

* Add ambient display category

Change-Id: Ibd1f67de0c5dd65620f7d977d09461c94458f936

doze/res/values/strings.xml

diff --git a/doze/res/values/strings.xml b/doze/res/values/strings.xml
index 2b54bfb..87810f4 100644
--- a/doze/res/values/strings.xml
+++ b/doze/res/values/strings.xml
@@ -17,10 +17,11 @@
     <string name="screen_gestures_panel_title">Gestures</string>
     <string name="screen_gestures_panel_summary">Use gestures to perform actions</string>
 
+    <string name="ambient_display_title">Ambient display</string>
+
     <string name="hand_wave_gesture_title">Hand wave</string>
     <string name="hand_wave_gesture_summary">Pulse notifications on hand wave</string>
 
     <string name="pocket_gesture_title">Pocket</string>
     <string name="pocket_gesture_summary">Pulse notifications on removal from pocket</string>
-
 </resources>

doze/res/xml/gesture_panel.xml

diff --git a/doze/res/xml/gesture_panel.xml b/doze/res/xml/gesture_panel.xml
index 29963d1..e5511e9 100644
--- a/doze/res/xml/gesture_panel.xml
+++ b/doze/res/xml/gesture_panel.xml
@@ -13,16 +13,21 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <SwitchPreference
-        android:key="gesture_hand_wave"
-        android:defaultValue="true"
-        android:title="@string/hand_wave_gesture_title"
-        android:summary="@string/hand_wave_gesture_summary" />
+    <PreferenceCategory
+        android:key="ambient_display_key"
+        android:title="@string/ambient_display_title" >
 
-    <SwitchPreference
-        android:key="gesture_pocket"
-        android:defaultValue="false"
-        android:title="@string/pocket_gesture_title"
-        android:summary="@string/pocket_gesture_summary" />
+        <SwitchPreference
+            android:key="gesture_hand_wave"
+            android:defaultValue="true"
+            android:title="@string/hand_wave_gesture_title"
+            android:summary="@string/hand_wave_gesture_summary" />
+
+        <SwitchPreference
+            android:key="gesture_pocket"
+            android:defaultValue="false"
+            android:title="@string/pocket_gesture_title"
+            android:summary="@string/pocket_gesture_summary" />
+    </PreferenceCategory>
 
 </PreferenceScreen>

doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java

diff --git a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java
index bb40546..94d6f0c 100644
--- a/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java
+++ b/doze/src/com/cyanogenmod/settings/device/TouchscreenGestureSettings.java
@@ -20,13 +20,20 @@
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.provider.Settings;
 
 public class TouchscreenGestureSettings extends PreferenceActivity {
 
+    private static final String CATEGORY_AMBIENT_DISPLAY = "ambient_display_key";
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.gesture_panel);
+        PreferenceCategory ambientDisplay =
+            (PreferenceCategory) findPreference(CATEGORY_AMBIENT_DISPLAY);
+        ambientDisplay.setEnabled(isDozeEnabled());
     }
 
     @Override
@@ -38,4 +45,9 @@
             getListView().setPadding(0, 0, 0, 0);
         }
     }
+
+    private boolean isDozeEnabled() {
+        return Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.DOZE_ENABLED, 1) != 0;
+    }
 }