summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2014-08-28 14:51:05 +0200
committer Selim Cinek <cinek@google.com> 2014-08-28 15:09:29 +0200
commit0d61b51852278de763d971ae0c57b27e6ed1ce6a (patch)
tree06cd6f5d7c494e846a2cd5bddbfaab40a611cd16
parent95ed59283bd25fb363d13c000a7408bcafb5e93e (diff)
Fixed a flash of the preview image when going to the dialer
The preview image was animating even though it should not have leading to a weird flash. Bug: 17261091 Change-Id: I168eae25eb654ceb79e055fb0d0189c31cb0bb3d
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java5
1 files changed, 4 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 4a6bfa106a11..5878ae1b3c3b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
@@ -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,