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

am 6e8c1495: Merge "Re-read shortcut labels if the language has changed"

Browse Source 
* commit '6e8c1495f6a65124750155409ce326736744a42b':
  Re-read shortcut labels if the language has changed
This commit is contained in:
Adam Powell
2012-11-20 15:05:13 -08:00
committed by Android Git Automerger
parent 3ee4740009 6e8c1495f6
commit 732e589c10
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ public final class MenuItemImpl implements MenuItem {
*/
private ContextMenuInfo mMenuInfo;
private static String sLanguage;
private static String sPrependShortcutLabel;
private static String sEnterShortcutLabel;
private static String sDeleteShortcutLabel;
@@ -114,7 +115,9 @@ public final class MenuItemImpl implements MenuItem {
MenuItemImpl(MenuBuilder menu, int group, int id, int categoryOrder, int ordering,
CharSequence title, int showAsAction) {
if (sPrependShortcutLabel == null) {
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);