commit 1d49ec9f416edec68db7df30ae0476d1942f65a6
author Jorim Jaggi <jjaggi@google.com> Mon Aug 25 18:44:01 2014 +0200
committer Jorim Jaggi <jjaggi@google.com> Tue Aug 26 18:39:47 2014 +0200
tree a19e23bd63266fc6594ea551c7bf377d08df6db1
parent 5369d7a9317a137ca0b7ad43c889203a7669626f

Fix jumping animation when using two-finger expand

Also fixes other minor issues with the panel expansion.

Bug: 17250134
Change-Id: I70ee5410bad10ff71f6d868005bf6274ef881e95

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index e1beb08..387abc3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -58,7 +58,7 @@
     private static final int CAP_HEIGHT = 1456;
     private static final int FONT_HEIGHT = 2163;
 
-    private static final float HEADER_RUBBERBAND_FACTOR = 2.15f;
+    private static final float HEADER_RUBBERBAND_FACTOR = 2.05f;
     private static final float LOCK_ICON_ACTIVE_SCALE = 1.2f;
 
     private KeyguardAffordanceHelper mAfforanceHelper;
@@ -1665,7 +1665,7 @@
     @Override
     protected boolean fullyExpandedClearAllVisible() {
         return mNotificationStackScroller.isDismissViewNotGone()
-                && mNotificationStackScroller.isScrolledToBottom();
+                && mNotificationStackScroller.isScrolledToBottom() && !mTwoFingerQsExpand;
     }
 
     @Override