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

Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c

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

Change-Id: Ia6d55cdd8c42406e347175cdf6c769bfe7e4a83e
This commit is contained in:
Treehugger Robot
2020-07-28 11:25:00 +00:00
committed by Automerger Merge Worker
parent c410ef3a43 17c895b94c
commit ce59418d0a
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

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