summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-07-07 15:59:58 -0700
committerClark Scheff <clark@cyngn.com>2016-07-08 14:58:55 -0700
commit12fdd7fd5667b8d99a5291d77fc817e1ab0be2ed (patch)
treee5cd1ac27befb8d2ae9e898cf03e8e3b4505b179 /packages
parent68eda0632a2e05b4c53a5ca57209583d8fbe6267 (diff)
downloadframeworks_base-12fdd7fd5667b8d99a5291d77fc817e1ab0be2ed.zip
frameworks_base-12fdd7fd5667b8d99a5291d77fc817e1ab0be2ed.tar.gz
frameworks_base-12fdd7fd5667b8d99a5291d77fc817e1ab0be2ed.tar.bz2
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
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java2
1 files changed, 1 insertions, 1 deletions
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,