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

Merge "Separate Tether summary "Off" to dedicated string ID"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-27 07:44:19 +00:00
committed by Android (Google) Code Review
parent d2597b4420 d0cd5492e4
commit ce71a7bba1
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

@@ -3245,6 +3245,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

@@ -217,7 +217,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);
@@ -233,7 +233,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 {