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

Commit 84c32c23 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where the pattern wouldn't show properly" into oc-mr1-dev 

am: 246a9f80

Change-Id: I63ab7c592586c7e370cd86f4efbe38614f71f1aa
parents ce03b1e0 246a9f80

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

+6 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class KeyguardBouncer { 
                }

            };

    private final Runnable mRemoveViewRunnable = this::removeView;

    private int mStatusBarHeight;



    public KeyguardBouncer(Context context, ViewMediatorCallback callback,

            LockPatternUtils lockPatternUtils, ViewGroup container,
@@ -129,7 +130,9 @@ public class KeyguardBouncer { 
            mRoot.setVisibility(View.VISIBLE);

            mKeyguardView.onResume();

            showPromptReason(mBouncerPromptReason);

            if (mKeyguardView.getHeight() != 0) {

            // We might still be collapsed and the view didn't have time to layout yet or still

            // be small, let's wait on the predraw to do the animation in that case.

            if (mKeyguardView.getHeight() != 0 && mKeyguardView.getHeight() != mStatusBarHeight) {

                mKeyguardView.startAppearAnimation();

            } else {

                mKeyguardView.getViewTreeObserver().addOnPreDrawListener(
@@ -252,6 +255,8 @@ public class KeyguardBouncer { 
        mKeyguardView.setLockPatternUtils(mLockPatternUtils);

        mKeyguardView.setViewMediatorCallback(mCallback);

        mContainer.addView(mRoot, mContainer.getChildCount());

        mStatusBarHeight = mRoot.getResources().getDimensionPixelOffset(

                com.android.systemui.R.dimen.status_bar_height);

        mRoot.setVisibility(View.INVISIBLE);



        final WindowInsets rootInsets = mRoot.getRootWindowInsets();