From eb6d37dc9d6c0a717a98d063c7327e8bfc44be73 Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Fri, 14 Feb 2020 12:08:47 +0800
Subject: [PATCH] Move "Allow from lock screen" into advanced item

Bug: 142529032
Test: Manual test
Change-Id: I697a30d2da8d17bbbabe78c7a97acce686f521ef
---
 res/xml/accessibility_settings.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index c10fffc6ee0..14bce78a93a 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -191,14 +191,8 @@
     <PreferenceCategory
         android:key="experimental_category"
         android:persistent="false"
-        android:title="@string/experimental_category_title">
-
-        <SwitchPreference
-            android:key="accessibility_shortcut_preference"
-            android:persistent="false"
-            android:title="@string/accessibility_shortcut_service_on_lock_screen_title"
-            android:summary="@string/accessibility_shortcut_description"
-            settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>
+        android:title="@string/experimental_category_title"
+        settings:initialExpandedChildrenCount="1">
 
         <SwitchPreference
             android:key="toggle_high_text_contrast_preference"
@@ -221,5 +215,14 @@
             android:persistent="false"
             android:title="@string/accessibility_display_inversion_preference_title"
             settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
+
+        <SwitchPreference
+            android:key="accessibility_shortcut_preference"
+            android:persistent="false"
+            android:title="@string/accessibility_shortcut_service_on_lock_screen_title"
+            android:summary="@string/accessibility_shortcut_description"
+            settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>
+
     </PreferenceCategory>
+
 </PreferenceScreen>