commit 0fd853ad669594df3c6c0b4200b6959fcee61fac
author Doris Ling <dling@google.com> Fri Jul 22 22:14:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 22 22:14:01 2016 +0000
tree 25512e5f22ba2d4fbf66ab2feba3f4f308d4ceb8
parent 53e9f35239b4c9b224696ab3c3e0ad9b5169d156
parent 2f92d751e00d807b639da955811bbe5a8dd6153c

Merge "Fix scroll issue when going from Display->Ambient Display to Moves." into nyc-mr1-dev

res/xml/display_settings.xml

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a3305a2..a89d687 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -82,13 +82,13 @@
                 android:key="doze"
                 android:title="@string/doze_title"
                 android:summary="@string/doze_summary" >
-                <extra android:name="gesture_scroll_to_preference"
-                       android:value="gesture_pick_up_and_nudge" />
                 <intent
                     android:targetPackage="com.android.settings"
                     android:targetClass="com.android.settings.Settings$GestureSettingsActivity" >
                     <extra android:name="show_drawer_menu"
                            android:value="true" />
+                    <extra android:name="gesture_scroll_to_preference"
+                           android:value="gesture_pick_up_and_nudge" />
                 </intent>
         </PreferenceScreen>