Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 am: eaba347a70

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: I903e6289111448ffe71856b1830b914823ff1953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kweku Adams
2023-03-16 20:45:56 +00:00
committed by Automerger Merge Worker
parent f98a5d8fb6 eaba347a70
commit 7c82ea06a2
70 changed files with 221 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/security/ScreenPinningPreferenceController.java
View File

@@ -38,7 +38,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.on)
: mContext.getText(R.string.off);
? mContext.getText(R.string.screen_pinning_switch_on_text)
: mContext.getText(R.string.screen_pinning_switch_off_text);
}
}