diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-08-18 07:08:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-18 07:08:46 -0700 |
| commit | 072039c71e3ef0e547cec4c28f05383debf439e1 (patch) | |
| tree | 8400da88a95f97f9288f7e963f8804cc679c7990 | |
| parent | fde00591c6e3243a7834b21f57e8c386f23aa597 (diff) | |
| parent | 130453c2eb615bb8cc51a26afbd40822a72636c1 (diff) | |
| download | frameworks_base-072039c71e3ef0e547cec4c28f05383debf439e1.zip frameworks_base-072039c71e3ef0e547cec4c28f05383debf439e1.tar.gz frameworks_base-072039c71e3ef0e547cec4c28f05383debf439e1.tar.bz2 | |
Merge "Fix DISABLE_EXPAND in the tablet status bar."
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java | 20 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 4 |
2 files changed, 10 insertions, 14 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 201ff2d..76dec5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -1220,9 +1220,7 @@ public class TabletStatusBar extends StatusBar implements private View.OnClickListener mOnClickListener = new View.OnClickListener() { public void onClick(View v) { - if (v == mNotificationTrigger) { - onClickNotificationTrigger(); - } else if (v == mRecentButton) { + if (v == mRecentButton) { onClickRecentButton(); } else if (v == mInputMethodSwitchButton) { onClickInputMethodSwitchButton(); @@ -1232,17 +1230,6 @@ public class TabletStatusBar extends StatusBar implements } }; - public void onClickNotificationTrigger() { - if (DEBUG) Slog.d(TAG, "clicked notification icons; disabled=" + mDisabled); - if ((mDisabled & StatusBarManager.DISABLE_EXPAND) == 0) { - int msg = !mNotificationPanel.isShowing() - ? MSG_OPEN_NOTIFICATION_PANEL - : MSG_CLOSE_NOTIFICATION_PANEL; - mHandler.removeMessages(msg); - mHandler.sendEmptyMessage(msg); - } - } - public void onClickRecentButton() { if (DEBUG) Slog.d(TAG, "clicked recent apps; disabled=" + mDisabled); if ((mDisabled & StatusBarManager.DISABLE_EXPAND) == 0) { @@ -1374,6 +1361,11 @@ public class TabletStatusBar extends StatusBar implements // event.getY(), // mInitialTouchX, // mInitialTouchY)); + + if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) { + return true; + } + final int action = event.getAction(); switch (action) { case MotionEvent.ACTION_DOWN: diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 06b7fb9..86de558 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -1142,6 +1142,10 @@ public class KeyguardViewMediator implements KeyguardViewCallback, // insecure and (is covered by another window OR this feature is enabled in general) boolean enable = !mShowing || ((ENABLE_STATUS_BAR_IN_KEYGUARD || mHidden) && !isSecure()); + if (DEBUG) { + Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mHidden=" + mHidden + + " isSecure=" + isSecure() + " --> enable=" + enable); + } mStatusBarManager.disable(enable ? StatusBarManager.DISABLE_NONE : ( StatusBarManager.DISABLE_EXPAND |