diff options
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java index 8df36750bfce..64772110cab1 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java @@ -73,6 +73,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout // Range: 0 (fully hidden) to 1 (fully visible) private float mChallengeOffset = 1.f; private boolean mChallengeShowing = true; + private boolean mChallengeShowingTargetState = true; private boolean mWasChallengeShowing = true; private boolean mIsBouncing = false; @@ -355,7 +356,8 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } void completeChallengeScroll() { - setChallengeShowing(mChallengeOffset != 0); + setChallengeShowing(mChallengeShowingTargetState); + mChallengeOffset = mChallengeShowing ? 1.f : 0.f; setScrollState(SCROLL_STATE_IDLE); mChallengeInteractiveInternal = true; mChallengeView.setLayerType(LAYER_TYPE_NONE, null); @@ -1112,6 +1114,7 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout } if (mHasLayout) { + mChallengeShowingTargetState = show; final int layoutBottom = getLayoutBottom(); animateChallengeTo(show ? layoutBottom : layoutBottom + mChallengeView.getHeight() - mChallengeBottomBound, velocity); |