summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2014-12-11 15:12:37 +0000
committer android-build-merger <android-build-merger@google.com> 2014-12-11 15:12:37 +0000
commitefa38cd36101d7469e8ed4db03cdebe818bbcfd2 (patch)
treeebe6fa300be0170a359193cc2c4b3700501666f1
parent7988ef9c4da50f007fde71a121f89e6b9796c69e (diff)
parentf8dc9d7b3d496593c6c6dddcd42cae13ac508876 (diff)
Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev
automerge: f8dc9d7 * commit 'f8dc9d7b3d496593c6c6dddcd42cae13ac508876': Fixed a bug where the pattern may become invisible
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
index 3212eec9dd9f..0dfe1dcbbefb 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
@@ -370,6 +370,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
final Runnable finishListener) {
if (appearing) {
animatedCell.scale = 0.0f;
+ animatedCell.alpha = 1.0f;
}
animatedCell.translateY = appearing ? translationY : 0;
ValueAnimator animator = ValueAnimator.ofFloat(animatedCell.translateY,