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

Commit 1a08a8f5 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev

parents 05546f45 0d61b518
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ public class KeyguardAffordanceView extends ImageView {

    public void setPreviewView(View v) {
        mPreviewView = v;
        if (mPreviewView != null) {
            mPreviewView.setVisibility(INVISIBLE);
        }
    }

    private void drawArrow(Canvas canvas) {
@@ -295,7 +298,7 @@ public class KeyguardAffordanceView extends ImageView {
            duration = Math.min(duration, CIRCLE_DISAPPEAR_MAX_DURATION);
            animator.setDuration(duration);
            animator.start();
            if (mPreviewView != null) {
            if (mPreviewView != null && mPreviewView.getVisibility() == View.VISIBLE) {
                mPreviewView.setVisibility(View.VISIBLE);
                mPreviewClipper = ViewAnimationUtils.createCircularReveal(
                        mPreviewView, getLeft() + mCenterX, getTop() + mCenterY, mCircleRadius,