Merge "Fixing crash on keyboard shortcuts popup" into ub-launcher3-edmonton (99dcc9fd) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+12 −10

Original line number	Diff line number	Diff line
		@@ -2305,7 +2305,8 @@ public class Launcher extends BaseDraggingActivity
		shortcutInfos.add(new KeyboardShortcutInfo(getString(R.string.all_apps_button_label),
		KeyEvent.KEYCODE_A, KeyEvent.META_CTRL_ON));
		}
		View currentFocus = getCurrentFocus();
		final View currentFocus = getCurrentFocus();
		if (currentFocus != null) {
		if (new CustomActionsPopup(this, currentFocus).canShow()) {
		shortcutInfos.add(new KeyboardShortcutInfo(getString(R.string.custom_actions),
		KeyEvent.KEYCODE_O, KeyEvent.META_CTRL_ON));
		@@ -2316,6 +2317,7 @@ public class Launcher extends BaseDraggingActivity
		getString(R.string.shortcuts_menu_with_notifications_description),
		KeyEvent.KEYCODE_S, KeyEvent.META_CTRL_ON));
		}
		}
		if (!shortcutInfos.isEmpty()) {
		data.add(new KeyboardShortcutGroup(getString(R.string.home_screen), shortcutInfos));
		}