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

Commit 82fb2e0b authored by Danesh M's avatar Danesh M
Browse files

Lockscreen : Ensure we hide bottom area in bouncer 

Since the bottom area lives in its own window, ensure we
hide it when the bouncer is showing to avoid overlaps.

CYNGNOS-2422
Change-Id: I465d24c9d64e67213ce2dff83f17625c490684f6
parent 7a8a51b2

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

+4 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class KeyguardBouncer { 
    private ViewGroup mRoot;

    private boolean mShowingSoon;

    private int mBouncerPromptReason;

    private PhoneStatusBar mPhoneStatusBar;

    private KeyguardUpdateMonitorCallback mUpdateMonitorCallback =

            new KeyguardUpdateMonitorCallback() {

                @Override
@@ -66,13 +67,14 @@ public class KeyguardBouncer { 


    public KeyguardBouncer(Context context, ViewMediatorCallback callback,

            LockPatternUtils lockPatternUtils, StatusBarWindowManager windowManager,

            ViewGroup container) {

            ViewGroup container, PhoneStatusBar phoneStatusBar) {

        mContext = context;

        mCallback = callback;

        mLockPatternUtils = lockPatternUtils;

        mContainer = container;

        mWindowManager = windowManager;

        mCmLockPatternUtils = new CmLockPatternUtils(mContext);

        mPhoneStatusBar = phoneStatusBar;

        KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback);

    }
@@ -86,7 +88,7 @@ public class KeyguardBouncer { 
        if (mRoot.getVisibility() == View.VISIBLE || mShowingSoon) {

            return;

        }



        mPhoneStatusBar.mKeyguardBottomArea.setVisibility(View.GONE);

        // Try to dismiss the Keyguard. If no security pattern is set, this will dismiss the whole

        // Keyguard. If we need to authenticate, show the bouncer.

        if (!mKeyguardView.dismiss()) {

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

+1 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class StatusBarKeyguardViewManager { 
        if (mBouncer != null) mBouncer.removeView();

        mFingerprintUnlockController = fingerprintUnlockController;

        mBouncer = new KeyguardBouncer(mContext, mViewMediatorCallback, mLockPatternUtils,

                mStatusBarWindowManager, container);

                mStatusBarWindowManager, container, mPhoneStatusBar);

    }



    /**
@@ -394,7 +394,6 @@ public class StatusBarKeyguardViewManager { 
    public void dismiss() {

        if ((mDeviceInteractive || mDeviceWillWakeUp)) {

            showBouncer();

            mPhoneStatusBar.mKeyguardBottomArea.setVisibility(View.GONE);

        }

    }