Merge "Map system shortcut keys" (fd6110f1) · Commits · e / os / android_frameworks_base

core/res/res/xml/bookmarks.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -19,22 +19,19 @@
		Bookmarks for vendor apps should be added to a bookmarks resource overlay; not here.

		Typical shortcuts (not necessarily defined here):
		'a': Calculator
		'b': Browser
		'c': Contacts
		'e': Email
		'g': GMail
		'l': Calendar
		'k': Calendar
		'm': Maps
		'p': Music
		's': SMS
		't': Talk
		'u': Calculator
		'y': YouTube
		-->
		<bookmarks>
		<bookmark
		category="android.intent.category.APP_CALCULATOR"
		shortcut="a" />
		<bookmark
		category="android.intent.category.APP_BROWSER"
		shortcut="b" />
		@@ -46,7 +43,7 @@
		shortcut="e" />
		<bookmark
		category="android.intent.category.APP_CALENDAR"
		shortcut="l" />
		shortcut="k" />
		<bookmark
		category="android.intent.category.APP_MAPS"
		shortcut="m" />
		@@ -56,4 +53,7 @@
		<bookmark
		category="android.intent.category.APP_MESSAGING"
		shortcut="s" />
		<bookmark
		category="android.intent.category.APP_CALCULATOR"
		shortcut="u" />
		</bookmarks>

packages/SettingsProvider/res/xml/bookmarks.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		Bookmarks for vendor apps should be added to a bookmarks resource overlay; not here.

		Typical shortcuts (not necessarily defined here):
		'a': Calculator
		'b': Browser
		'c': Contacts
		'e': Email
		@@ -29,12 +28,10 @@
		'p': Music
		's': SMS
		't': Talk
		'u': Calculator
		'y': YouTube
		-->
		<bookmarks>
		<bookmark
		category="android.intent.category.APP_CALCULATOR"
		shortcut="a" />
		<bookmark
		category="android.intent.category.APP_BROWSER"
		shortcut="b" />
		@@ -46,7 +43,7 @@
		shortcut="e" />
		<bookmark
		category="android.intent.category.APP_CALENDAR"
		shortcut="l" />
		shortcut="k" />
		<bookmark
		category="android.intent.category.APP_MAPS"
		shortcut="m" />
		@@ -56,4 +53,7 @@
		<bookmark
		category="android.intent.category.APP_MESSAGING"
		shortcut="s" />
		<bookmark
		category="android.intent.category.APP_CALCULATOR"
		shortcut="u" />
		</bookmarks>

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

+27 −9

Original line number	Diff line number	Diff line
		@@ -1714,6 +1714,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		private void showSystemSettings() {
		startActivityAsUser(new Intent(android.provider.Settings.ACTION_SETTINGS),
		UserHandle.CURRENT_OR_SELF);
		}

		private void showPictureInPictureMenu(KeyEvent event) {
		if (DEBUG_INPUT) Log.d(TAG, "showPictureInPictureMenu event=" + event);
		mHandler.removeMessages(MSG_SHOW_PICTURE_IN_PICTURE_MENU);
		@@ -2900,6 +2905,20 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}
		return key_consumed;
		case KeyEvent.KEYCODE_A:
		if (down && event.isMetaPressed()) {
		launchAssistAction(Intent.EXTRA_ASSIST_INPUT_HINT_KEYBOARD,
		event.getDeviceId(),
		event.getEventTime(), AssistUtils.INVOCATION_TYPE_UNKNOWN);
		return key_consumed;
		}
		break;
		case KeyEvent.KEYCODE_I:
		if (down && event.isMetaPressed()) {
		showSystemSettings();
		return key_consumed;
		}
		break;
		case KeyEvent.KEYCODE_N:
		if (down && event.isMetaPressed()) {
		IStatusBarService service = getStatusBarService();
		@@ -3040,12 +3059,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		break;
		case KeyEvent.KEYCODE_TAB:
		if (event.isMetaPressed()) {
		// Pass through keyboard navigation keys.
		return key_not_consumed;
		if (down && event.isMetaPressed()) {
		if (!keyguardOn && isUserSetupComplete()) {
		showRecentApps(false);
		return key_consumed;
		}
		} else if (down && repeatCount == 0) {
		// Display task switcher for ALT-TAB.
		if (down && repeatCount == 0) {
		if (mRecentAppsHeldModifiers == 0 && !keyguardOn && isUserSetupComplete()) {
		final int shiftlessModifiers =
		event.getModifiers() & ~KeyEvent.META_SHIFT_MASK;
		@@ -3100,9 +3120,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mPendingCapsLockToggle = false;
		} else if (mPendingMetaAction) {
		if (!canceled) {
		launchAssistAction(Intent.EXTRA_ASSIST_INPUT_HINT_KEYBOARD,
		event.getDeviceId(),
		event.getEventTime(), AssistUtils.INVOCATION_TYPE_UNKNOWN);
		// TODO: launch all apps here.
		}
		mPendingMetaAction = false;
		}