From 1949a5d69f196ed05402f3dae40dcbc4f5df8694 Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Mon, 10 May 2021 19:39:58 +0800
Subject: [PATCH] =?UTF-8?q?[Material=20Next]=20Move=20=E2=80=9Cmain=20swit?=
 =?UTF-8?q?ch=E2=80=9D=20right=20below=20illustration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: 187688296
Test: Manual testing
Change-Id: Ic36b6deaad410fce49dcc19861a11307fb479f55
---
 res/xml/captioning_settings.xml                      | 12 ++++++------
 .../ToggleDaltonizerPreferenceFragment.java          |  2 +-
 .../ToggleFeaturePreferenceFragment.java             |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 30e76de506f..b39714632b3 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -21,12 +21,6 @@
     android:persistent="false"
     android:title="@string/accessibility_captioning_title">
 
-    <com.android.settings.widget.SettingsMainSwitchPreference
-        android:key="captioning_preference_switch"
-        android:persistent="false"
-        android:summary="@string/accessibility_caption_primary_switch_summary"
-        android:title="@string/accessibility_caption_primary_switch_title" />
-
     <com.android.settingslib.widget.LayoutPreference
         android:key="captions_preview"
         android:layout="@layout/accessibility_captions_preview"
@@ -35,6 +29,12 @@
         android:title="@string/summary_placeholder"
         settings:searchable="false" />
 
+    <com.android.settings.widget.SettingsMainSwitchPreference
+        android:key="captioning_preference_switch"
+        android:persistent="false"
+        android:summary="@string/accessibility_caption_primary_switch_summary"
+        android:title="@string/accessibility_caption_primary_switch_title" />
+
     <Preference
         android:fragment="com.android.settings.accessibility.CaptionAppearanceFragment"
         android:key="captioning_caption_appearance"
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 7ff5e9f908b..4bcf4781162 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -103,8 +103,8 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
     /** Customizes the order by preference key. */
     protected List<String> getPreferenceOrderList() {
         final List<String> lists = new ArrayList<>();
-        lists.add(KEY_USE_SERVICE_PREFERENCE);
         lists.add(KEY_PREVIEW);
+        lists.add(KEY_USE_SERVICE_PREFERENCE);
         lists.add(KEY_CATEGORY_MODE);
         lists.add(KEY_GENERAL_CATEGORY);
         lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 062bb73feff..231a492776c 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -379,8 +379,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
     /** Customizes the order by preference key. */
     protected List<String> getPreferenceOrderList() {
         final List<String> lists = new ArrayList<>();
-        lists.add(KEY_USE_SERVICE_PREFERENCE);
         lists.add(KEY_ANIMATED_IMAGE);
+        lists.add(KEY_USE_SERVICE_PREFERENCE);
         lists.add(KEY_GENERAL_CATEGORY);
         lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);
         return lists;