From d0cd5492e4980337a9f6c6b1000b67a58cba7c8a Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Sat, 24 Sep 2022 22:50:54 +0800
Subject: [PATCH] Separate Tether summary "Off" to dedicated string ID

- Separate Tether summary "Off" to dedicated string ID for special language translation

Bug: 228573128
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherPreferenceControllerTest

Change-Id: I0615eb03d6329ef73b714af39e78836ae17ea408
---
 res/values/strings.xml                                        | 2 ++
 .../android/settings/network/TetherPreferenceController.java  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f17a46f88b..9cbb0626c10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3243,6 +3243,8 @@
 
     <!-- Tethering setting summary when hotspot and tethering are off [CHAR LIMIT=NONE]-->
     <string name="tether_settings_summary_off">Not sharing internet with other devices</string>
+    <!-- Tethering preference summary when hotspot and tethering are off [CHAR LIMIT=NONE]-->
+    <string name="tether_preference_summary_off">Off</string>
 
     <!-- Tethering interface options [CHAR LIMIT=NONE]-->
     <string name="tethering_interface_options">Tethering</string>
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 12c359dc4f8..1aa84dddf6d 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -216,7 +216,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
         }
         if (!hotSpotOn && !tetherOn) {
             // Both off
-            mPreference.setSummary(R.string.off);
+            updateSummaryToOff();
         } else if (hotSpotOn && tetherOn) {
             // Both on
             mPreference.setSummary(R.string.tether_settings_summary_hotspot_on_tether_on);
@@ -232,7 +232,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
             // Preference is not ready yet.
             return;
         }
-        mPreference.setSummary(R.string.off);
+        mPreference.setSummary(R.string.tether_preference_summary_off);
     }
 
     class SettingObserver extends ContentObserver {