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

Commit 4be2b5c2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "More inclusive language."

parents 0f6b2ec2 cd2c453c

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

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

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