From 1093b24c1b749ba92eb59aad93695504761aa66f Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Tue, 12 Jul 2016 11:25:47 -0700
Subject: [PATCH] Update preference ordering in Gestures settings.

Swapped the fingerprint swipe and ambient display preference in
Settings->Gestures, and updated the summary text in Display->Ambient
display

Bug: 30073941
Change-Id: Ifc386b4ab9b0e7317f1ee0e477f9670e8a49b0f9
---
 res/values/strings.xml       |  2 +-
 res/xml/display_settings.xml |  2 +-
 res/xml/gesture_settings.xml | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b8b4273e375..1e5cd145ebd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2207,7 +2207,7 @@
     <!-- [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 you pick up device or receive notifications</string>
+    <string name="doze_summary">Wake screen when you double-tap it or get new notifications. See how</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 0630b55216d..e96a0506d83 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -81,7 +81,7 @@
         <PreferenceScreen
                 android:key="doze"
                 android:title="@string/doze_title"
-                android:summary="@string/ambient_display_summary"
+                android:summary="@string/doze_summary"
                 android:fragment="com.android.settings.gestures.GestureSettings" >
                 <extra android:name="gesture_scroll_to_preference"
                        android:value="gesture_pick_up_and_nudge" />
diff --git a/res/xml/gesture_settings.xml b/res/xml/gesture_settings.xml
index 78f65a6306f..55189e5ebfa 100644
--- a/res/xml/gesture_settings.xml
+++ b/res/xml/gesture_settings.xml
@@ -31,16 +31,16 @@
         android:summary="@string/double_twist_for_camera_mode_summary"
         settings:animation="@raw/gesture_twist"/>
 
-    <com.android.settings.gestures.GesturePreference
-        android:key="gesture_swipe_down_fingerprint"
-        android:title="@string/fingerprint_swipe_for_notifications_title"
-        android:summary="@string/fingerprint_swipe_for_notifications_summary"
-        settings:animation="@raw/gesture_fingerprint_swipe"/>
-
     <com.android.settings.gestures.GesturePreference
         android:key="gesture_pick_up_and_nudge"
         android:title="@string/ambient_display_title"
         android:summary="@string/ambient_display_summary"
         settings:animation="@raw/gesture_ambient_tap"/>
 
+    <com.android.settings.gestures.GesturePreference
+        android:key="gesture_swipe_down_fingerprint"
+        android:title="@string/fingerprint_swipe_for_notifications_title"
+        android:summary="@string/fingerprint_swipe_for_notifications_summary"
+        settings:animation="@raw/gesture_fingerprint_swipe"/>
+
 </PreferenceScreen>
\ No newline at end of file