commit b5c990e9120655a0e77bc48413d5ee7fc212f82c
author Selim Cinek <cinek@google.com> Thu Dec 11 18:13:40 2014 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 11 18:13:40 2014 +0000
tree b4430e35e9e876580d60309ac9871e1cd91cbc7b
parent 4572664ddc2c7035bee250caff6d5f87160a2c22
parent a34913f572a422732a553ae957d1795d3adff0b1

Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev automerge: f8dc9d7 automerge: efa38cd
automerge: a34913f

* commit 'a34913f572a422732a553ae957d1795d3adff0b1':
  Fixed a bug where the pattern may become invisible

packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
index 3212eec..0dfe1dc 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
@@ -370,6 +370,7 @@
             final Runnable finishListener) {
         if (appearing) {
             animatedCell.scale = 0.0f;
+            animatedCell.alpha = 1.0f;
         }
         animatedCell.translateY = appearing ? translationY : 0;
         ValueAnimator animator = ValueAnimator.ofFloat(animatedCell.translateY,