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

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

Browse Source
This commit is contained in:
Geoff Mendal
2016-02-03 12:20:50 +00:00
committed by android-build-merger
parent cd069cbba1 5b5bda42f0
commit 0fe67519b5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/Activity.java
View File

@@ -1677,7 +1677,8 @@ public class Activity extends ContextThemeWrapper
final char alphaShortcut = item.getAlphabeticShortcut();
if (title != null && alphaShortcut != MIN_VALUE) {
if (group == null) {
group = new KeyboardShortcutGroup(null /* no label */);
final int resource = mApplication.getApplicationInfo().labelRes;
group = new KeyboardShortcutGroup(resource != 0 ? getString(resource) : null);
}
group.addItem(new KeyboardShortcutInfo(
title, alphaShortcut, KeyEvent.META_CTRL_ON));