From 1e8feef1faca7d2f14bf459691dbe724c8cf5c88 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Thu, 16 Aug 2012 11:37:41 -0400
Subject: [PATCH] Fix status bar disabling.

Bug: 6998403
Change-Id: I8a47e694f2f3914ef5cf0d180b0309783148c627
---
 .../src/com/android/systemui/statusbar/phone/PanelBar.java | 7 +++++++
 .../android/systemui/statusbar/phone/PhoneStatusBar.java   | 4 ----
 .../systemui/statusbar/phone/PhoneStatusBarView.java       | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

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 78ec4b6373fff..427cd8c9c969b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
@@ -69,8 +69,15 @@ public class PanelBar extends FrameLayout {
         return mPanels.get((int)(N * x / getMeasuredWidth()));
     }
 
+    public boolean isEnabled() {
+        return true;
+    }
+
     @Override
     public boolean onTouchEvent(MotionEvent event) {
+        // Allow subclasses to implement enable/disable semantics
+        if (!isEnabled()) return false;
+
         // figure out which panel needs to be talked to here
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             mTouchingPanel = selectPanelForTouchX(event.getX());
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 4ce4e293790ef..8884179a9a6fd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1309,10 +1309,6 @@ public class PhoneStatusBar extends BaseStatusBar {
 
         mGestureRec.add(event);
 
-        if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) {
-            return false;
-        }
-
         return false;
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
index 924e45d6d66db..a42e455c2bfc5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
@@ -17,6 +17,7 @@
 package com.android.systemui.statusbar.phone;
 
 import android.app.ActivityManager;
+import android.app.StatusBarManager;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -69,6 +70,11 @@ public class PhoneStatusBarView extends PanelBar {
         }
     }
 
+    @Override
+    public boolean isEnabled() {
+        return ((mBar.mDisabled & StatusBarManager.DISABLE_EXPAND) == 0);
+    }
+
     @Override
     public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
         if (super.onRequestSendAccessibilityEvent(child, event)) {