Merge "Keyboard shortcuts: minor naming refactor" (2f300111) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ oneway interface IStatusBar
		void cancelPreloadRecentApps();
		void showScreenPinningRequest();

		void showKeyboardShortcutsMenu();
		void toggleKeyboardShortcutsMenu();

		/**
		* Notifies the status bar that an app transition is pending to delay applying some flags with

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ interface IStatusBarService
		void preloadRecentApps();
		void cancelPreloadRecentApps();

		void showKeyboardShortcutsMenu();
		void toggleKeyboardShortcutsMenu();

		/**
		* Notifies the status bar that an app transition is pending to delay applying some flags with

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

+6 −7

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		protected static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 1023;
		protected static final int MSG_SHOW_NEXT_AFFILIATED_TASK = 1024;
		protected static final int MSG_SHOW_PREV_AFFILIATED_TASK = 1025;
		protected static final int MSG_SHOW_KEYBOARD_SHORTCUTS_MENU = 1026;
		protected static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS_MENU = 1026;

		protected static final boolean ENABLE_HEADS_UP = true;
		// scores above this threshold should be displayed in heads up mode.
		@@ -1116,8 +1116,8 @@ public abstract class BaseStatusBar extends SystemUI implements
		}

		@Override
		public void showKeyboardShortcutsMenu() {
		int msg = MSG_SHOW_KEYBOARD_SHORTCUTS_MENU;
		public void toggleKeyboardShortcutsMenu() {
		int msg = MSG_TOGGLE_KEYBOARD_SHORTCUTS_MENU;
		mHandler.removeMessages(msg);
		mHandler.sendEmptyMessage(msg);
		}
		@@ -1198,8 +1198,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		}
		}

		// TODO: this (and maybe a few layers above) should be called toggle instead of show.
		protected void showKeyboardShortcuts() {
		protected void toggleKeyboardShortcuts() {
		getKeyboardShortcuts().toggleKeyboardShortcuts(mContext);
		}

		@@ -1323,8 +1322,8 @@ public abstract class BaseStatusBar extends SystemUI implements
		case MSG_SHOW_PREV_AFFILIATED_TASK:
		showRecentsPreviousAffiliatedTask();
		break;
		case MSG_SHOW_KEYBOARD_SHORTCUTS_MENU:
		showKeyboardShortcuts();
		case MSG_TOGGLE_KEYBOARD_SHORTCUTS_MENU:
		toggleKeyboardShortcuts();
		break;
		}
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ public class CommandQueue extends IStatusBar.Stub {
		private static final int MSG_ASSIST_DISCLOSURE = 22 << MSG_SHIFT;
		private static final int MSG_START_ASSIST = 23 << MSG_SHIFT;
		private static final int MSG_CAMERA_LAUNCH_GESTURE = 24 << MSG_SHIFT;
		private static final int MSG_SHOW_KEYBOARD_SHORTCUTS = 25 << MSG_SHIFT;
		private static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS = 25 << MSG_SHIFT;

		public static final int FLAG_EXCLUDE_NONE = 0;
		public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
		@@ -100,7 +100,7 @@ public class CommandQueue extends IStatusBar.Stub {
		public void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey);
		public void toggleRecentApps();
		public void preloadRecentApps();
		public void showKeyboardShortcutsMenu();
		public void toggleKeyboardShortcutsMenu();
		public void cancelPreloadRecentApps();
		public void setWindowState(int window, int state);
		public void buzzBeepBlinked();
		@@ -229,10 +229,10 @@ public class CommandQueue extends IStatusBar.Stub {
		}

		@Override
		public void showKeyboardShortcutsMenu() {
		public void toggleKeyboardShortcutsMenu() {
		synchronized (mList) {
		mHandler.removeMessages(MSG_SHOW_KEYBOARD_SHORTCUTS);
		mHandler.obtainMessage(MSG_SHOW_KEYBOARD_SHORTCUTS).sendToTarget();
		mHandler.removeMessages(MSG_TOGGLE_KEYBOARD_SHORTCUTS);
		mHandler.obtainMessage(MSG_TOGGLE_KEYBOARD_SHORTCUTS).sendToTarget();
		}
		}

		@@ -380,8 +380,8 @@ public class CommandQueue extends IStatusBar.Stub {
		case MSG_CANCEL_PRELOAD_RECENT_APPS:
		mCallbacks.cancelPreloadRecentApps();
		break;
		case MSG_SHOW_KEYBOARD_SHORTCUTS:
		mCallbacks.showKeyboardShortcutsMenu();
		case MSG_TOGGLE_KEYBOARD_SHORTCUTS:
		mCallbacks.toggleKeyboardShortcutsMenu();
		break;
		case MSG_SET_WINDOW_STATE:
		mCallbacks.setWindowState(msg.arg1, msg.arg2);

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -2879,7 +2879,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		} else if (keyCode == KeyEvent.KEYCODE_SLASH && event.isMetaPressed()) {
		if (down) {
		if (repeatCount == 0) {
		showKeyboardShortcutsMenu();
		toggleKeyboardShortcutsMenu();
		}
		}
		} else if (keyCode == KeyEvent.KEYCODE_ASSIST) {
		@@ -3311,11 +3311,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		private void showKeyboardShortcutsMenu() {
		private void toggleKeyboardShortcutsMenu() {
		try {
		IStatusBarService statusbar = getStatusBarService();
		if (statusbar != null) {
		statusbar.showKeyboardShortcutsMenu();
		statusbar.toggleKeyboardShortcutsMenu();
		}
		} catch (RemoteException e) {
		Slog.e(TAG, "RemoteException when showing keyboard shortcuts menu", e);