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 @@ - Reset options - - - Reset Wi-Fi, mobile & Bluetooth - - This will reset all network settings, including:\n\n
  • Wi\u2011Fi
  • \n
  • Mobile data
  • \n
  • Bluetooth
  • "
    + + + Reset Mobile Network Settings + + This will reset all mobile network settings + + Reset Mobile Network 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"> - + 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"; } }