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

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

Merge "Fix gender issue on subtext of screen pinning" into sc-dev

parents e63e2a78 304c68a8

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -9769,6 +9769,11 @@ 
    <string name="switch_on_text">On</string>

    <string name="switch_off_text">Off</string>

















    <!-- The subtext when screen pinning feature is enabled. [CHAR LIMIT=28] -->









    <string name="screen_pinning_switch_on_text">On</string>









    <!-- The subtext when screen pinning feature is disabled. [CHAR LIMIT=28] -->









    <string name="screen_pinning_switch_off_text">Off</string>









    <!-- [CHAR LIMIT=28] Screen pinning title -->









    <string name="screen_pinning_title">App pinning</string>









    <!-- [CHAR LIMIT=none] Screen pinning introduction -->

























src/com/android/settings/security/ScreenPinningPreferenceController.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -40,7 +40,7 @@ public class ScreenPinningPreferenceController extends BasePreferenceController







    public CharSequence getSummary() {









        return Settings.System.getInt(mContext.getContentResolver(),









                Settings.System.LOCK_TO_APP_ENABLED, 0) != 0









                ? mContext.getText(R.string.switch_on_text)









                : mContext.getText(R.string.switch_off_text);









                ? mContext.getText(R.string.screen_pinning_switch_on_text)









                : mContext.getText(R.string.screen_pinning_switch_off_text);









    }









}