| commit | dbbf45e79affa3e29b0f376719d297fe9c1f8a37 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Jun 25 21:54:48 2014 +0200 |
| committer | Jorim Jaggi <jjaggi@google.com> | Wed Jun 25 22:00:07 2014 +0200 |
| tree | afb08614baee8c9bb2e6d380c07bf8966fdb077f | |
| parent | bcd836519713103fede1455a52e1deaa43548edb [diff] [blame] |
Attempt to fix infinite recursion. When collapsing a panel without animating, it might be that an overscroll animating was still running, and thus expandedHeight != 0 even if we set expandedFraction manually to 0, which sets the state to STATE_OPEN again and tries to close it in an infinite loop. Bug: 15721600 Change-Id: I14e0ee43fb4a47286d618cc97581d4e4a98fb2a2
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 a6ce5d5..c684c9f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -302,6 +302,8 @@ mUnlockIconActive = false; mPageSwiper.reset(); closeQs(); + mNotificationStackScroller.setOverScrollAmount(0f, true /* onTop */, false /* animate */, + true /* cancelAnimators */); } public void closeQs() {