Merge "Map META+T shortcut to toggling task bar" into udc-dev (3a4a25f6) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,7 @@ oneway interface IStatusBar
	void showRecentApps(boolean triggeredFromAltTab);		void showRecentApps(boolean triggeredFromAltTab);
	void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);		void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);
	void toggleRecentApps();		void toggleRecentApps();
			void toggleTaskbar();
	void toggleSplitScreen();		void toggleSplitScreen();
	void preloadRecentApps();		void preloadRecentApps();
	void cancelPreloadRecentApps();		void cancelPreloadRecentApps();

packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,4 +104,9 @@ oneway interface IOverviewProxy {
	* Sent when the surface for navigation bar is created or changed		* Sent when the surface for navigation bar is created or changed
	*/		*/
	void onNavigationBarSurface(in SurfaceControl surface) = 26;		void onNavigationBarSurface(in SurfaceControl surface) = 26;

			/**
			* Sent when the task bar stash state is toggled.
			*/
			void onTaskbarToggled() = 27;
	}		}

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -436,6 +436,19 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
	}		}
	}		}

			@Override
			public void toggleTaskbar() {
			if (mOverviewProxyService.getProxy() == null) {
			return;
			}

			try {
			mOverviewProxyService.getProxy().onTaskbarToggled();
			} catch (RemoteException e) {
			Log.e(TAG, "onTaskbarToggled() failed", e);
			}
			}

	private void clearTransient() {		private void clearTransient() {
	if (mTaskbarTransientShowing) {		if (mTaskbarTransientShowing) {
	mTaskbarTransientShowing = false;		mTaskbarTransientShowing = false;

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,7 @@ public class CommandQueue extends IStatusBar.Stub implements
	private static final int MSG_GO_TO_FULLSCREEN_FROM_SPLIT = 70 << MSG_SHIFT;		private static final int MSG_GO_TO_FULLSCREEN_FROM_SPLIT = 70 << MSG_SHIFT;
	private static final int MSG_ENTER_STAGE_SPLIT_FROM_RUNNING_APP = 71 << MSG_SHIFT;		private static final int MSG_ENTER_STAGE_SPLIT_FROM_RUNNING_APP = 71 << MSG_SHIFT;
	private static final int MSG_SHOW_MEDIA_OUTPUT_SWITCHER = 72 << MSG_SHIFT;		private static final int MSG_SHOW_MEDIA_OUTPUT_SWITCHER = 72 << MSG_SHIFT;
			private static final int MSG_TOGGLE_TASKBAR = 73 << MSG_SHIFT;

	public static final int FLAG_EXCLUDE_NONE = 0;		public static final int FLAG_EXCLUDE_NONE = 0;
	public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;		public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
	@@ -229,6 +230,7 @@ public class CommandQueue extends IStatusBar.Stub implements
	@BackDispositionMode int backDisposition, boolean showImeSwitcher) { }		@BackDispositionMode int backDisposition, boolean showImeSwitcher) { }
	default void showRecentApps(boolean triggeredFromAltTab) { }		default void showRecentApps(boolean triggeredFromAltTab) { }
	default void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { }		default void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { }
			default void toggleTaskbar() { }
	default void toggleRecentApps() { }		default void toggleRecentApps() { }
	default void toggleSplitScreen() { }		default void toggleSplitScreen() { }
	default void preloadRecentApps() { }		default void preloadRecentApps() { }
	@@ -715,6 +717,13 @@ public class CommandQueue extends IStatusBar.Stub implements
	}		}
	}		}

			public void toggleTaskbar() {
			synchronized (mLock) {
			mHandler.removeMessages(MSG_TOGGLE_TASKBAR);
			mHandler.obtainMessage(MSG_TOGGLE_TASKBAR, 0, 0, null).sendToTarget();
			}
			}

	public void toggleRecentApps() {		public void toggleRecentApps() {
	synchronized (mLock) {		synchronized (mLock) {
	mHandler.removeMessages(MSG_TOGGLE_RECENT_APPS);		mHandler.removeMessages(MSG_TOGGLE_RECENT_APPS);
	@@ -1416,6 +1425,11 @@ public class CommandQueue extends IStatusBar.Stub implements
	mCallbacks.get(i).hideRecentApps(msg.arg1 != 0, msg.arg2 != 0);		mCallbacks.get(i).hideRecentApps(msg.arg1 != 0, msg.arg2 != 0);
	}		}
	break;		break;
			case MSG_TOGGLE_TASKBAR:
			for (int i = 0; i < mCallbacks.size(); i++) {
			mCallbacks.get(i).toggleTaskbar();
			}
			break;
	case MSG_TOGGLE_RECENT_APPS:		case MSG_TOGGLE_RECENT_APPS:
	for (int i = 0; i < mCallbacks.size(); i++) {		for (int i = 0; i < mCallbacks.size(); i++) {
	mCallbacks.get(i).toggleRecentApps();		mCallbacks.get(i).toggleRecentApps();

services/core/java/com/android/server/policy/PhoneWindowManager.java

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2993,6 +2993,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	return key_consumed;		return key_consumed;
	}		}
	break;		break;
			case KeyEvent.KEYCODE_T:
			if (down && event.isMetaPressed()) {
			toggleTaskbar();
			return key_consumed;
			}
			break;
	case KeyEvent.KEYCODE_DPAD_UP:		case KeyEvent.KEYCODE_DPAD_UP:
	if (down && event.isMetaPressed() && event.isCtrlPressed() && repeatCount == 0) {		if (down && event.isMetaPressed() && event.isCtrlPressed() && repeatCount == 0) {
	StatusBarManagerInternal statusbar = getStatusBarManagerInternal();		StatusBarManagerInternal statusbar = getStatusBarManagerInternal();
	@@ -3664,6 +3670,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	}		}

			private void toggleTaskbar() {
			StatusBarManagerInternal statusbar = getStatusBarManagerInternal();
			if (statusbar != null) {
			statusbar.toggleTaskbar();
			}
			}

	private void toggleRecentApps() {		private void toggleRecentApps() {
	mPreloadedRecentApps = false; // preloading no longer needs to be canceled		mPreloadedRecentApps = false; // preloading no longer needs to be canceled
	StatusBarManagerInternal statusbar = getStatusBarManagerInternal();		StatusBarManagerInternal statusbar = getStatusBarManagerInternal();