commit 0fe67519b5d657853e1d5575a626c53d3f48b6fe
author Geoff Mendal <mendal@google.com> Wed Feb 03 12:20:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 03 12:20:50 2016 +0000
tree 2f11de9da44732e9501cdfb0e809b3bf137531b6
parent cd069cbba194709708f5f5fe2f60d270cbb58f2c
parent 5b5bda42f04a723754d05cf11c9d6c1677876a6b

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

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index acd4ab8..e0eb389 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1677,7 +1677,8 @@
             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));