Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3455f8d0 authored by Vadim Tryshev's avatar Vadim Tryshev
Browse files

Fixing crash on keyboard shortcuts popup 

Bug: 76218025
Test: Manual
Change-Id: I11c9005764c7b0492138dc17716a0c6c4578798e
parent 08cf36ea

src/com/android/launcher3/Launcher.java

+12 −10
Original line number Diff line number Diff line
@@ -2291,7 +2291,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));
@@ -2302,6 +2303,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));

        }