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

Commit 436f42bd authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Hide keyguard lock icon when QS user icon enabled 

Test: Build with config_keyguard_user_switch_opens_qs_details=true and
      config_keyguardUserSwitcher=true, check that there is no lock icon
      on keyguard.
Test: Build with config_keyguard_user_switch_opens_qs_details=false and
      config_keyguardUserSwitcher=false, check that there is a lock icon
      on keyguard.
Test: atest SystemUITests:com.android.systemui.statusbar.phone.LockscreenIconControllerTest

Bug: 181235684
Change-Id: Ic81ef56eb0caf297d1078447b9b749c2b504a1e9
parent 01dabee9

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

+13 −1
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ 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;
@@ -1916,7 +1917,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            return isFaceAuthEnabledForUser(KeyguardUpdateMonitor.getCurrentUser())

                    && !isUdfpsEnrolled();

        }

        return true;

        return !isKeyguardQsUserSwitchEnabled();

    }



    /**
@@ -1926,6 +1927,17 @@ 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

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

                mKeyguardUserSwitcherEnabled && mResources.getBoolean(

                        R.bool.config_keyguard_user_switch_opens_qs_details);

        keyguardUpdateMonitor.setKeyguardQsUserSwitchEnabled(mKeyguardQsUserSwitchEnabled);

        mView.setWillNotDraw(!DEBUG);

        mLayoutInflater = layoutInflater;

        mFalsingManager = falsingManager;