From 911de7fa8520f919cda673ae70c25f86ae0edf98 Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Mon, 4 Aug 2014 14:53:28 -0400
Subject: Settings: Wire up new doze opt-out setting.

Add an item in Display settings for enabling or disabling
dozing.  The setting will only appear on devices that have
configured a doze component.

Bug:16703536
Change-Id: Iba5f0a25cef68924f5be5f858b4c396234a7a355
---
 res/values/strings.xml       | 4 ++++
 res/xml/display_settings.xml | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 29ab3cb..d9bdb85 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2062,6 +2062,10 @@
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
     <string name="lift_to_wake_title">Lift to wake</string>
+    <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+    <string name="doze_title">Ambient display</string>
+    <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+    <string name="doze_summary">Wake screen when device picked up or notifications arrive</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index e86fbb8..cb6bab0 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -57,6 +57,12 @@
                 android:title="@string/lift_to_wake_title"
                 android:persistent="false" />
 
+        <SwitchPreference
+                android:key="doze"
+                android:title="@string/doze_title"
+                android:summary="@string/doze_summary"
+                android:persistent="false" />
+
         <com.android.settings.WarnedListPreference
                 android:key="font_size"
                 android:title="@string/title_font_size"
-- 
cgit v1.1