From 2f92d751e00d807b639da955811bbe5a8dd6153c Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Fri, 22 Jul 2016 13:28:21 -0700
Subject: [PATCH] Fix scroll issue when going from Display->Ambient Display to
 Moves.

Move the scroll-to extra param to inside the launch intent of the doze
preference screen for it to take effect. The original extra param is
added to the preference screen itself as we were defining the fragment
to launch previously.

Change-Id: Id3e8cfbe61b46be2a5945da7e531f1a3c8b1454f
Fixes: 30262357
---
 res/xml/display_settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a3305a286ab..a89d687b97d 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>