From 3c4635c19997748e0b21453f3462e347905534e0 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Thu, 29 May 2014 02:12:47 +0200
Subject: 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
---
 .../src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 1 +
 .../SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java     | 1 +
 .../SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java    | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'packages')

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();
 }
-- 
cgit v1.1