Merge "Attempt to fix infinite recursion."

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

@@ -302,6 +302,8 @@ public class NotificationPanelView extends PanelView implements
         mUnlockIconActive = false;
         mPageSwiper.reset();
         closeQs();
+        mNotificationStackScroller.setOverScrollAmount(0f, true /* onTop */, false /* animate */,
+                true /* cancelAnimators */);
     }
 
     public void closeQs() {

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

@@ -188,10 +188,10 @@ public class PanelBar extends FrameLayout {
                 pv.collapse();
                 waiting = true;
             } else {
+                pv.resetViews();
                 pv.setExpandedFraction(0); // just in case
                 pv.setVisibility(View.GONE);
                 pv.cancelPeek();
-                pv.resetViews();
             }
         }
         if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting);