From 8d43fd9a356bf27d8d9c4bfe9af1fb70c49217f3 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Wed, 14 Dec 2022 16:48:48 +0000
Subject: [PATCH] [Settings] Change network reset into reset mobile network

Replace reset network into Reset mobile network settings

Bug: 260034791
Test: local and auto
Change-Id: I9547f266c1586073fd2b96f35cc9df8861b0a105
---
 ...etwork.xml => reset_mobile_network_settings.xml} |  4 ++--
 res/values/strings.xml                              | 12 +++++++-----
 res/xml/reset_dashboard_fragment.xml                |  6 +++---
 src/com/android/settings/ResetNetwork.java          | 13 +++++--------
 .../network/NetworkResetPreferenceController.java   |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)
 rename res/layout/{reset_network.xml => reset_mobile_network_settings.xml} (94%)

diff --git a/res/layout/reset_network.xml b/res/layout/reset_mobile_network_settings.xml
similarity index 94%
rename from res/layout/reset_network.xml
rename to res/layout/reset_mobile_network_settings.xml
index ac1563e5fbf..6b2df4b66e4 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_mobile_network_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2022 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextAppearance.PreferenceTitle.SettingsLib"
                 android:textDirection="locale"
-                android:text="@string/reset_network_desc" />
+                android:text="@string/reset_mobile_network_settings_desc" />
             <include layout="@layout/reset_esim_checkbox"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33873ba51e1..b939b3e01a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2719,11 +2719,13 @@
     <!-- Title for a screen containing all device reset options [CHAR LIMIT=50] -->
     <string name="reset_dashboard_title">Reset options</string>
 
-    <!-- Reset Network -->
-    <!-- Button title to reset Wi-Fi settings, Mobile data setting, bluetooth settings -->
-    <string name="reset_network_title">Reset Wi-Fi, mobile &amp; Bluetooth</string>
-    <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
-    <string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Mobile data</li>\n<li>Bluetooth</li>"</string>
+    <!-- Reset Mobile Network -->
+    <!-- Button title to reset Mobile network setting -->
+    <string name="reset_mobile_network_settings_title">Reset Mobile Network Settings</string>
+    <!-- User selects Reset mobile network settings [CHAR LIMIT=NONE] -->
+    <string name="reset_mobile_network_settings_desc">This will reset all mobile network settings</string>
+    <!-- Reset Mobile network setting confirmation screen title [CHAR LIMIT=30] -->
+    <string name="reset_mobile_network_settings_confirm_title">Reset Mobile Network Settings?</string>
 
     <!-- Reset Bluetooth and Wi-Fi Network -->
     <!-- Dialog title to reset Bluetooth and Wi-Fi settings -->
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index 5502558fc3a..98f6c02a8f2 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -20,10 +20,10 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/reset_dashboard_title">
 
-    <!-- Network reset -->
+    <!-- Mobile Network reset -->
     <com.android.settingslib.RestrictedPreference
-        android:key="network_reset_pref"
-        android:title="@string/reset_network_title"
+        android:key="network_reset_mobile_network_settings_pref"
+        android:title="@string/reset_mobile_network_settings_title"
         settings:userRestriction="no_network_reset"
         settings:useAdminDisabledSummary="true"
         settings:isPreferenceVisible="@bool/config_show_sim_info"
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 7fb818a3160..da15d035862 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -85,7 +85,7 @@ public class ResetNetwork extends InstrumentedFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getActivity().setTitle(R.string.reset_network_title);
+        getActivity().setTitle(R.string.reset_mobile_network_settings_title);
 
         mActivityResultLauncher = registerForActivityResult(
                 new ActivityResultContracts.StartActivityForResult(),
@@ -103,7 +103,7 @@ public class ResetNetwork extends InstrumentedFragment {
         final ChooseLockSettingsHelper.Builder builder =
                 new ChooseLockSettingsHelper.Builder(getActivity(), this);
         return builder.setRequestCode(request)
-                .setTitle(res.getText(R.string.reset_network_title))
+                .setTitle(res.getText(R.string.reset_mobile_network_settings_title))
                 .setActivityResultLauncher(mActivityResultLauncher)
                 .show();
     }
@@ -124,10 +124,7 @@ public class ResetNetwork extends InstrumentedFragment {
 
         ResetNetworkRequest request = new ResetNetworkRequest(
                 ResetNetworkRequest.RESET_CONNECTIVITY_MANAGER |
-                ResetNetworkRequest.RESET_VPN_MANAGER |
-                ResetNetworkRequest.RESET_WIFI_MANAGER |
-                ResetNetworkRequest.RESET_WIFI_P2P_MANAGER |
-                ResetNetworkRequest.RESET_BLUETOOTH_MANAGER
+                ResetNetworkRequest.RESET_VPN_MANAGER
         );
         if (mSubscriptions != null && mSubscriptions.size() > 0) {
             int selectedIndex = mSubscriptionSpinner.getSelectedItemPosition();
@@ -146,7 +143,7 @@ public class ResetNetwork extends InstrumentedFragment {
         new SubSettingLauncher(getContext())
                 .setDestination(ResetNetworkConfirm.class.getName())
                 .setArguments(args)
-                .setTitleRes(R.string.reset_network_confirm_title)
+                .setTitleRes(R.string.reset_mobile_network_settings_confirm_title)
                 .setSourceMetricsCategory(getMetricsCategory())
                 .launch();
     }
@@ -305,7 +302,7 @@ public class ResetNetwork extends InstrumentedFragment {
             return view;
         }
 
-        mContentView = inflater.inflate(R.layout.reset_network, null);
+        mContentView = inflater.inflate(R.layout.reset_mobile_network_settings, null);
 
         establishInitialState(getActiveSubscriptionInfoList());
         return mContentView;
diff --git a/src/com/android/settings/network/NetworkResetPreferenceController.java b/src/com/android/settings/network/NetworkResetPreferenceController.java
index 8842c618854..af288fa88a5 100644
--- a/src/com/android/settings/network/NetworkResetPreferenceController.java
+++ b/src/com/android/settings/network/NetworkResetPreferenceController.java
@@ -40,6 +40,6 @@ public class NetworkResetPreferenceController extends AbstractPreferenceControll
 
     @Override
     public String getPreferenceKey() {
-        return "network_reset_pref";
+        return "network_reset_mobile_network_settings_pref";
     }
 }