From cd2c453cbd8650d7471ff36022a7efe40dfc3a19 Mon Sep 17 00:00:00 2001 From: Alan Stokes Date: Mon, 27 Jul 2020 18:02:48 +0100 Subject: [PATCH] More inclusive language. Test: Builds Bug: 161896447 Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b --- src/com/android/settings/security/ScreenPinningSettings.java | 2 +- .../screenlock/LockAfterTimeoutPreferenceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index c60fd472a92..1c5413de6ff 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -184,7 +184,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment } /** - * Listens to the state change of the lock-to-app master switch. + * Listens to the state change of the overall lock-to-app switch. */ @Override public void onSwitchChanged(Switch switchView, boolean isChecked) { diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index 999c945e878..abeef2d2a0a 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -112,7 +112,7 @@ public class LockAfterTimeoutPreferenceController extends AbstractPreferenceCont mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId()); final long displayTimeout = Math.max(0, Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0)); - // This setting is a slave to display timeout when a device policy is enforced. + // This setting is a secondary to display timeout when a device policy is enforced. // As such, maxLockTimeout = adminTimeout - displayTimeout. // If there isn't enough time, shows "immediately" setting. final long maxTimeout = Math.max(0, adminTimeout - displayTimeout);