Update gesture related settings in Display.
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.
Bug: 28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5142e6..0958720 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5847,6 +5847,7 @@
<string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>
<string name="keywords_profile_challenge">work challenge, work, profile</string>
<string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
+ <string name="keywords_gesture">gesture</string>
<!-- NFC Wi-Fi pairing/setup strings-->
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 6b5bda6..cb1fac5 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -63,11 +63,6 @@
android:title="@string/camera_gesture_title"
android:summary="@string/camera_gesture_desc" />
- <SwitchPreference
- android:key="camera_double_tap_power_gesture"
- android:title="@string/camera_double_tap_power_gesture_title"
- android:summary="@string/camera_double_tap_power_gesture_desc" />
-
<PreferenceScreen
android:key="screensaver"
android:title="@string/screensaver_settings_title"
@@ -77,10 +72,14 @@
android:key="lift_to_wake"
android:title="@string/lift_to_wake_title" />
- <SwitchPreference
+ <PreferenceScreen
android:key="doze"
android:title="@string/doze_title"
- android:summary="@string/doze_summary" />
+ android:summary="@string/doze_summary"
+ android:fragment="com.android.settings.gestures.GestureSettings" >
+ <extra android:name=":settings:fragment_args_key"
+ android:value="gesture_pick_up_and_nudge" />
+ </PreferenceScreen>
<SwitchPreference
android:key="tap_to_wake"
diff --git a/res/xml/gesture_settings.xml b/res/xml/gesture_settings.xml
index e68d8f5..5adc311 100644
--- a/res/xml/gesture_settings.xml
+++ b/res/xml/gesture_settings.xml
@@ -16,7 +16,8 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/gesture_preference_title">
+ android:title="@string/gesture_preference_title"
+ settings:keywords="@string/keywords_gesture">
<com.android.settings.gestures.GesturePreference
android:key="gesture_double_tap_power"