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

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

Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev 

am: 17bc1fd0

* commit '17bc1fd0':
  Fixed a bug where the pin wasn't scaled correctly
  Fixed a bug where the scrim was transparent

Change-Id: I3259a79075ece8f4159d5bc4272ce39fd37f3b5f
parents bcfd427b 17bc1fd0

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

+1 −0
Original line number Diff line number Diff line
@@ -974,6 +974,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        inflateEmptyShadeView();

        updateEmptyShadeView();

        inflateOverflowContainer();

        mStatusBarKeyguardViewManager.onDensityOrFontScaleChanged();

    }



    private void inflateSignalClusters() {

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

+9 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    private boolean mSkipFirstFrame;

    private boolean mDontAnimateBouncerChanges;

    private boolean mKeyguardFadingOutInProgress;

    private ValueAnimator mKeyguardFadeoutAnimation;



    public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim) {

        mScrimBehind = scrimBehind;
@@ -135,6 +136,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
            if (mPinnedHeadsUpCount != 0) {

                updateHeadsUpScrim(false);

            }

            if (mKeyguardFadeoutAnimation != null) {

                mKeyguardFadeoutAnimation.cancel();

            }

        }

    }
@@ -345,7 +349,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
                    mOnAnimationFinished.run();

                    mOnAnimationFinished = null;

                }

                if (mKeyguardFadingOutInProgress) {

                    mKeyguardFadeoutAnimation = null;

                    mKeyguardFadingOutInProgress = false;

                }

                scrim.setTag(TAG_KEY_ANIM, null);

                scrim.setTag(TAG_KEY_ANIM_TARGET, null);

            }
@@ -353,6 +360,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        anim.start();

        if (mAnimateKeyguardFadingOut) {

            mKeyguardFadingOutInProgress = true;

            mKeyguardFadeoutAnimation = anim;

        }

        if (mSkipFirstFrame) {

            anim.setCurrentPlayTime(16);

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

+4 −0
Original line number Diff line number Diff line
@@ -349,6 +349,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }

    }



    public void onDensityOrFontScaleChanged() {

        mBouncer.hide(true /* destroyView */);

    }



    private void animateScrimControllerKeyguardFadingOut(long delay, long duration,

            boolean skipFirstFrame) {

        animateScrimControllerKeyguardFadingOut(delay, duration, null /* endRunnable */,