diff options
| author | Selim Cinek <cinek@google.com> | 2014-05-29 02:12:47 +0200 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-05-29 02:12:47 +0200 |
| commit | 3c4635c19997748e0b21453f3462e347905534e0 (patch) | |
| tree | 9b0d2bbffef6e80e4cfc033a299d3d3b8d4f329a /packages | |
| parent | 4c6969a512cd70831249ec1d07691f16fe5465f5 (diff) | |
| download | frameworks_base-3c4635c19997748e0b21453f3462e347905534e0.zip frameworks_base-3c4635c19997748e0b21453f3462e347905534e0.tar.gz frameworks_base-3c4635c19997748e0b21453f3462e347905534e0.tar.bz2 | |
Fixed a bug where the user was unable to pull down statusbar.
When going to the phone or camera from the lockscreen, touches
where blocked and the statusbar could not be pulled down anymore.
Bug: 15308821
Bug: 15126905
Change-Id: Ic9563346f6a466cb5ada3f4af518fabcd650e9b9
Diffstat (limited to 'packages')
3 files changed, 4 insertions, 0 deletions
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 838e5e3..0c27ab0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -260,6 +260,7 @@ public class NotificationPanelView extends PanelView implements mQsExpansionEnabled = qsExpansionEnabled; } + @Override public void resetViews() { mBlockTouches = false; mPageSwiper.reset(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java index 1015d5b..b94f6f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java @@ -191,6 +191,7 @@ public class PanelBar extends FrameLayout { pv.setExpandedFraction(0); // just in case pv.setVisibility(View.GONE); pv.cancelPeek(); + pv.resetViews(); } } if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index f6db8a8..c5a9b85 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -540,4 +540,6 @@ public abstract class PanelView extends FrameLayout { mHeightAnimator, ((mHeightAnimator !=null && mHeightAnimator.isStarted())?" (started)":"") )); } + + public abstract void resetViews(); } |