Merge "Fix DISABLE_EXPAND in the tablet status bar." (072039c7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

+6 −14

Original line number	Diff line number	Diff line
		@@ -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:

+4 −0

Original line number	Diff line number	Diff line
		@@ -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