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

Commit ce59418d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "More inclusive language." am: 4be2b5c2 am: ef56fb20 am: b2a47016 am: 17c895b9 

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

Change-Id: Ia6d55cdd8c42406e347175cdf6c769bfe7e4a83e
parents c410ef3a 17c895b9

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {

src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);