Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev

2 files changed, 21 insertions, 4 deletions

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
index b82d7c7469ea..88cf343e8019 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
@@ -220,6 +220,11 @@ public class KeyguardViewStateManager implements
                     mKeyguardWidgetPager.setWidgetToResetOnPageFadeOut(mPageListeningToSlider);
                 }
             }
+            if (frame.isSmall()) {
+                // This is to make sure that if the scroller animation gets cut off midway
+                // that the frame doesn't stay in a partial down position.
+                frame.setFrameHeight(frame.getSmallFrameHeight());
+            }
             if (scrollState != SlidingChallengeLayout.SCROLL_STATE_FADING) {
                 frame.hideFrame(this);
             }
@@ -250,7 +255,7 @@ public class KeyguardViewStateManager implements
                 if (!frame.isSmall()) {
                     // We need to fetch the final page, in case the pages are in motion.
                     mPageListeningToSlider = mKeyguardWidgetPager.getNextPage();
-                    frame.shrinkWidget();
+                    frame.shrinkWidget(false);
                 }
             } else {
                 if (!frame.isSmall()) {
@@ -269,7 +274,7 @@ public class KeyguardViewStateManager implements
     public void onScrollPositionChanged(float scrollPosition, int challengeTop) {
         mChallengeTop = challengeTop;
         KeyguardWidgetFrame frame = mKeyguardWidgetPager.getWidgetPageAt(mPageListeningToSlider);
-        if (frame != null && !mKeyguardWidgetPager.isPageMoving()) {
+        if (frame != null && mLastScrollState != SlidingChallengeLayout.SCROLL_STATE_FADING) {
             frame.adjustFrame(getChallengeTopRelativeToFrame(frame, mChallengeTop));
         }
     }
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java
index d9953bfd05c6..4c7ab6c0b08d 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java
@@ -329,6 +329,7 @@ public class KeyguardWidgetFrame extends FrameLayout {
 
     public void setMaxChallengeTop(int top) {
         boolean dirty = mMaxChallengeTop != top;
+        mMaxChallengeTop = top;
         mSmallWidgetHeight = top - getPaddingTop();
         mSmallFrameHeight = top + getPaddingBottom();
         if (dirty && mIsSmall) {
@@ -348,10 +349,21 @@ public class KeyguardWidgetFrame extends FrameLayout {
         setFrameHeight(frameHeight);
     }
 
-    public void shrinkWidget() {
+    public void shrinkWidget(boolean alsoShrinkFrame) {
         mIsSmall = true;
         setWidgetHeight(mSmallWidgetHeight);
-        setFrameHeight(mSmallFrameHeight);
+
+        if (alsoShrinkFrame) {
+            setFrameHeight(mSmallFrameHeight);
+        }
+    }
+
+    public int getSmallFrameHeight() {
+        return mSmallFrameHeight;
+    }
+
+    public void shrinkWidget() {
+        shrinkWidget(true);
     }
 
     public void setWidgetLockedSmall(boolean locked) {