Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into tm-dev (43dc334d) · Commits · e / os / android_frameworks_base

core/java/android/view/KeyboardShortcutInfo.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ import android.os.Parcelable;
		*/
		public final class KeyboardShortcutInfo implements Parcelable {
		private final CharSequence mLabel;
		private final Icon mIcon;
		private Icon mIcon;
		private final char mBaseCharacter;
		private final int mKeycode;
		private final int mModifiers;
		@@ -115,6 +115,15 @@ public final class KeyboardShortcutInfo implements Parcelable {
		return mIcon;
		}

		/**
		* Removes an icon that was previously set.
		*
		* @hide
		*/
		public void clearIcon() {
		mIcon = null;
		}

		/**
		* Returns the base keycode that, combined with the modifiers, triggers this shortcut. If the
		* base character was set instead, returns {@link KeyEvent#KEYCODE_UNKNOWN}. Valid keycodes are

+9 −0

Original line number	Diff line number	Diff line
		@@ -378,6 +378,7 @@ public final class KeyboardShortcuts {
		@Override
		public void onKeyboardShortcutsReceived(
		final List<KeyboardShortcutGroup> result) {
		sanitiseShortcuts(result);
		result.add(getSystemShortcuts());
		final KeyboardShortcutGroup appShortcuts = getDefaultApplicationShortcuts();
		if (appShortcuts != null) {
		@@ -388,6 +389,14 @@ public final class KeyboardShortcuts {
		}, deviceId);
		}

		static void sanitiseShortcuts(List<KeyboardShortcutGroup> shortcutGroups) {
		for (KeyboardShortcutGroup group : shortcutGroups) {
		for (KeyboardShortcutInfo info : group.getItems()) {
		info.clearIcon();
		}
		}
		}

		private void dismissKeyboardShortcuts() {
		if (mKeyboardShortcutsDialog != null) {
		mKeyboardShortcutsDialog.dismiss();