PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate Tether summary "Off" to dedicated string ID

Browse Source 
- 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
This commit is contained in:
Weng Su
2022-09-24 22:50:54 +08:00
parent f9b0a270db
commit d0cd5492e4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3243,6 +3243,8 @@
<!-- Tethering setting summary when hotspot and tethering are off [CHAR LIMIT=NONE]--> <!-- 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> <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]--> <!-- Tethering interface options [CHAR LIMIT=NONE]-->
<string name="tethering_interface_options">Tethering</string> <string name="tethering_interface_options">Tethering</string>

4
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -216,7 +216,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
} }
if (!hotSpotOn && !tetherOn) { if (!hotSpotOn && !tetherOn) {
// Both off // Both off
mPreference.setSummary(R.string.off); updateSummaryToOff();
} else if (hotSpotOn && tetherOn) { } else if (hotSpotOn && tetherOn) {
// Both on // Both on
mPreference.setSummary(R.string.tether_settings_summary_hotspot_on_tether_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. // Preference is not ready yet.
return; return;
} }
mPreference.setSummary(R.string.off); mPreference.setSummary(R.string.tether_preference_summary_off);
} }
class SettingObserver extends ContentObserver { class SettingObserver extends ContentObserver {