From e00b6cfa4cb262bf4b861c68440d8c76ae7b28a1 Mon Sep 17 00:00:00 2001
From: Yomna Nasser <yomna@google.com>
Date: Sun, 8 Aug 2021 03:24:06 +0000
Subject: [PATCH] Move "Allow 2G" controller under
 DisabledSubscriptionController.

Bug: 195576795
Test: manual
Change-Id: Ib42df245394bfbebc832f421ebd6c49bc2dc88d4
---
 res/xml/mobile_network_settings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index eef22131c4d..79f84d3f6f6 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -241,6 +241,12 @@
             settings:controller="com.android.settings.network.telephony.CarrierPreferenceController">
         </Preference>
 
+        <SwitchPreference
+            android:key="enable_2g"
+            android:title="@string/enable_2g_title"
+            android:summary="@string/enable_2g_summary"
+            settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />
+
     </PreferenceCategory>
 
     <Preference
@@ -265,10 +271,4 @@
         settings:allowDividerAbove="true"
         settings:searchable="false"
         settings:controller="com.android.settings.network.telephony.NrDisabledInDsdsFooterPreferenceController"/>
-
-    <SwitchPreference
-        android:key="enable_2g"
-        android:title="@string/enable_2g_title"
-        android:summary="@string/enable_2g_summary"
-        settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />
 </PreferenceScreen>