commit 6138f1ab31e90f59c725e4d4738c008c3fa30391
author Andrew Sapperstein <asapperstein@google.com> Wed Mar 22 18:00:47 2017 -0700
committer Andrew Sapperstein <asapperstein@google.com> Wed Mar 22 18:20:37 2017 -0700
tree 74eb6acdf41c1f9e71c325ebeef8f470b1e4a4d2
parent e39e8350a12acabe19dcf8aae7cc9064665ce71c

Add double-tap & lift gestures to display settings

Now they're in both languages & input and display.

Change-Id: Ib0d9fa1aa39656662307e2fc8fda70443f1ae8ed
Fixes: 36415612
Test: robotests

res/xml/display_settings.xml

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index cb58ef2..b4ab7df 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -56,10 +56,10 @@
             android:title="@string/display_auto_rotate_title" />
 
         <SwitchPreference
-                android:key="auto_brightness"
-                android:title="@string/auto_brightness_title"
-                settings:keywords="@string/keywords_display_auto_brightness"
-                android:summary="@string/auto_brightness_summary" />
+            android:key="auto_brightness"
+            android:title="@string/auto_brightness_title"
+            settings:keywords="@string/keywords_display_auto_brightness"
+            android:summary="@string/auto_brightness_summary" />
 
         <Preference
             android:key="font_size"
@@ -87,32 +87,42 @@
             android:entryValues="@array/night_mode_values" /> -->
 
         <SwitchPreference
-                android:key="camera_gesture"
-                android:title="@string/camera_gesture_title"
-                android:summary="@string/camera_gesture_desc" />
+            android:key="camera_gesture"
+            android:title="@string/camera_gesture_title"
+            android:summary="@string/camera_gesture_desc" />
 
         <SwitchPreference
-                android:key="lift_to_wake"
-                android:title="@string/lift_to_wake_title" />
+            android:key="lift_to_wake"
+            android:title="@string/lift_to_wake_title" />
+
+        <Preference
+            android:key="gesture_double_tap_screen"
+            android:title="@string/ambient_display_title"
+            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings"/>
+
+        <Preference
+            android:key="gesture_pick_up"
+            android:title="@string/ambient_display_pickup_title"
+            android:fragment="com.android.settings.gestures.PickupGestureSettings"/>
 
         <SwitchPreference
-                android:key="doze"
-                android:title="@string/doze_title"
-                android:summary="@string/doze_summary" />
+            android:key="doze"
+            android:title="@string/doze_title"
+            android:summary="@string/doze_summary" />
 
         <SwitchPreference
-                android:key="tap_to_wake"
-                android:title="@string/tap_to_wake"
-                android:summary="@string/tap_to_wake_summary" />
+            android:key="tap_to_wake"
+            android:title="@string/tap_to_wake"
+            android:summary="@string/tap_to_wake_summary" />
 
         <ListPreference
-                android:key="theme"
-                android:title="@string/device_theme"
-                android:summary="%s" />
+            android:key="theme"
+            android:title="@string/device_theme"
+            android:summary="%s" />
 
         <DropDownPreference
-                android:key="vr_display_pref"
-                android:summary="%s"
-                android:title="@string/display_vr_pref_title" />
+            android:key="vr_display_pref"
+            android:summary="%s"
+            android:title="@string/display_vr_pref_title" />
 
 </PreferenceScreen>