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

Commit 1ecccb72 authored by Andrei Stingaceanu's avatar Andrei Stingaceanu Committed by android-build-merger
Browse files

Merge "Keyboard shortcuts: minor type change" into nyc-dev 

am: 73c9391d

* commit '73c9391d':
  Keyboard shortcuts: minor type change

Change-Id: I76311c998e94c75272e99bdec9f44d821a981f19
parents 8eaeaf6c 73c9391d

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+1 −3
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ import java.util.List; 
import static android.content.Context.LAYOUT_INFLATER_SERVICE;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;



import com.google.android.collect.Lists;



/**

 * Contains functionality for handling keyboard shortcuts.

 */
@@ -371,7 +369,7 @@ public final class KeyboardShortcuts { 


    private KeyboardShortcutGroup getDefaultApplicationShortcuts() {

        final int userId = mContext.getUserId();

        List<KeyboardShortcutInfo> keyboardShortcutInfoAppItems = Lists.newArrayList();

        List<KeyboardShortcutInfo> keyboardShortcutInfoAppItems = new ArrayList<>();



        // Assist.

        final AssistUtils assistUtils = new AssistUtils(mContext);