From 12fdd7fd5667b8d99a5291d77fc817e1ab0be2ed Mon Sep 17 00:00:00 2001 From: d34d Date: Thu, 7 Jul 2016 15:59:58 -0700 Subject: Keyguard: Don't circular reveal a non-visible view This follows the same logic used in the setCirculeRadius method in this class and avoids performing a circular reveal on a non-visible, and possibly detached, view. Change-Id: I238a81433fd78e41192ca099bd68404ae1d0ac6e TICKET: FEIJ-1501 --- .../src/com/android/systemui/statusbar/KeyguardAffordanceView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java index 902073d..1f7e687 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java @@ -283,7 +283,7 @@ public class KeyguardAffordanceView extends ImageView implements Palette.Palette }); animatorToRadius.start(); setImageAlpha(0, true); - if (mPreviewView != null) { + if (mPreviewView != null && mPreviewView.getVisibility() == View.VISIBLE) { mPreviewView.setVisibility(View.VISIBLE); mPreviewClipper = ViewAnimationUtils.createCircularReveal( mPreviewView, getLeft() + mCenterX, getTop() + mCenterY, mCircleRadius, -- cgit v1.1