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

More inclusive language.

Browse Source 
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
This commit is contained in:
Alan Stokes
2020-07-27 18:02:48 +01:00
parent 0f6b2ec233
commit cd2c453cbd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/security/ScreenPinningSettings.java
View File

@@ -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) {

2
src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
View File

@@ -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);