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

Commit 01d16d84 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

Merge "Revert "Hide keyguard lock icon when QS user icon enabled"" into sc-dev

parents a72513ef 608a153a

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −13
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private boolean mLogoutEnabled;

    // cached value to avoid IPCs

    private boolean mIsUdfpsEnrolled;

    private boolean mKeyguardQsUserSwitchEnabled;

    // If the user long pressed the lock icon, disabling face auth for the current session.

    private boolean mLockIconPressed;

    private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -1953,7 +1952,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            return isFaceAuthEnabledForUser(KeyguardUpdateMonitor.getCurrentUser())

                    && !isUdfpsEnrolled();

        }

        return !isKeyguardQsUserSwitchEnabled();

        return true;

    }



    /**
@@ -1963,17 +1962,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        return mIsUdfpsEnrolled;

    }



    /**

     * @return true if the keyguard qs user switcher shortcut is enabled

     */

    public boolean isKeyguardQsUserSwitchEnabled() {

        return mKeyguardQsUserSwitchEnabled;

    }



    public void setKeyguardQsUserSwitchEnabled(boolean enabled) {

        mKeyguardQsUserSwitchEnabled = enabled;

    }



    private final UserSwitchObserver mUserSwitchObserver = new UserSwitchObserver() {

        @Override

        public void onUserSwitching(int newUserId, IRemoteCallback reply) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+0 −1
Original line number Diff line number Diff line
@@ -611,7 +611,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        mKeyguardQsUserSwitchEnabled =

                mKeyguardUserSwitcherEnabled && mResources.getBoolean(

                        R.bool.config_keyguard_user_switch_opens_qs_details);

        keyguardUpdateMonitor.setKeyguardQsUserSwitchEnabled(mKeyguardQsUserSwitchEnabled);

        mShouldUseSplitNotificationShade =

                Utils.shouldUseSplitNotificationShade(mFeatureFlags, mResources);

        mView.setWillNotDraw(!DEBUG);