Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Display shortcut modifiers in menu" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-14 02:48:57 +00:00
committed by Android (Google) Code Review
parent cb7b04a56e d842533f22
commit 2801bf00de
3 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
core/java/com/android/internal/view/menu/MenuItemImpl.java
View File

@@ -23,6 +23,7 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.util.Log;
@@ -33,6 +34,7 @@ import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewDebug;
import android.widget.LinearLayout;
@@ -108,13 +110,6 @@ public final class MenuItemImpl implements MenuItem {
private CharSequence mContentDescription;
private CharSequence mTooltipText;
private static String sLanguage;
private static String sPrependShortcutLabel;
private static String sEnterShortcutLabel;
private static String sDeleteShortcutLabel;
private static String sSpaceShortcutLabel;
/**
* Instantiates this menu item.
*
@@ -130,20 +125,6 @@ public final class MenuItemImpl implements MenuItem {
MenuItemImpl(MenuBuilder menu, int group, int id, int categoryOrder, int ordering,
CharSequence title, int showAsAction) {
String lang = menu.getContext().getResources().getConfiguration().locale.toString();
if (sPrependShortcutLabel == null || !lang.equals(sLanguage)) {
sLanguage = lang;
// This is instantiated from the UI thread, so no chance of sync issues
sPrependShortcutLabel = menu.getContext().getResources().getString(
com.android.internal.R.string.prepend_shortcut_label);
sEnterShortcutLabel = menu.getContext().getResources().getString(
com.android.internal.R.string.menu_enter_shortcut_label);
sDeleteShortcutLabel = menu.getContext().getResources().getString(
com.android.internal.R.string.menu_delete_shortcut_label);
sSpaceShortcutLabel = menu.getContext().getResources().getString(
com.android.internal.R.string.menu_space_shortcut_label);
}
mMenu = menu;
mId = id;
mGroup = group;
@@ -353,19 +334,45 @@ public final class MenuItemImpl implements MenuItem {
return "";
}
StringBuilder sb = new StringBuilder(sPrependShortcutLabel);
final Resources res = mMenu.getContext().getResources();
StringBuilder sb = new StringBuilder();
if (ViewConfiguration.get(mMenu.getContext()).hasPermanentMenuKey()) {
// Only prepend "Menu+" if there is a hardware menu key.
sb.append(res.getString(
com.android.internal.R.string.prepend_shortcut_label));
}
final int modifiers =
mMenu.isQwertyMode() ? mShortcutAlphabeticModifiers : mShortcutNumericModifiers;
appendModifier(sb, modifiers, KeyEvent.META_META_ON, res.getString(
com.android.internal.R.string.menu_meta_shortcut_label));
appendModifier(sb, modifiers, KeyEvent.META_CTRL_ON, res.getString(
com.android.internal.R.string.menu_ctrl_shortcut_label));
appendModifier(sb, modifiers, KeyEvent.META_ALT_ON, res.getString(
com.android.internal.R.string.menu_alt_shortcut_label));
appendModifier(sb, modifiers, KeyEvent.META_SHIFT_ON, res.getString(
com.android.internal.R.string.menu_shift_shortcut_label));
appendModifier(sb, modifiers, KeyEvent.META_SYM_ON, res.getString(
com.android.internal.R.string.menu_sym_shortcut_label));
appendModifier(sb, modifiers, KeyEvent.META_FUNCTION_ON, res.getString(
com.android.internal.R.string.menu_function_shortcut_label));
switch (shortcut) {
case '\n':
sb.append(sEnterShortcutLabel);
sb.append(res.getString(
com.android.internal.R.string.menu_enter_shortcut_label));
break;
case '\b':
sb.append(sDeleteShortcutLabel);
sb.append(res.getString(
com.android.internal.R.string.menu_delete_shortcut_label));
break;
case ' ':
sb.append(sSpaceShortcutLabel);
sb.append(res.getString(
com.android.internal.R.string.menu_space_shortcut_label));
break;
default:
@@ -376,6 +383,12 @@ public final class MenuItemImpl implements MenuItem {
return sb.toString();
}
private static void appendModifier(StringBuilder sb, int mask, int modifier, String label) {
if ((mask & modifier) == modifier) {
sb.append(label);
}
}
/**
* @return Whether this menu item should be showing shortcuts (depends on
* whether the menu should show shortcuts and whether this item has