Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce71a7bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d2597b44 d0cd5492

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3245,6 +3245,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>
































src/com/android/settings/network/TetherPreferenceController.java



+2
−2






























Original line number
Diff line number
Diff line







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








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