diff options
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 78ec4b6373ff..427cd8c9c969 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 4ce4e293790e..8884179a9a6f 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 924e45d6d66d..a42e455c2bfc 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; @@ -70,6 +71,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)) { // The status bar is very small so augment the view that the user is touching |