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

Commit 203ae48f authored by Andrei Stingaceanu's avatar Andrei Stingaceanu Committed by android-build-merger
Browse files

Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into... 

Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev am: 1a83df8b am: 9e16d116
am: e0ea2e06

* commit 'e0ea2e06':
  Keyboard shortcuts: dismiss when activities start via shortcut

Change-Id: Ic86b86c3254318d17059b4650a9c7bcb652bddf3
parents 51e8cdcb e0ea2e06

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3424,6 +3424,7 @@ package android.app { 
    method public void closeOptionsMenu();

    method public android.app.PendingIntent createPendingResult(int, android.content.Intent, int);

    method public final deprecated void dismissDialog(int);

    method public final void dismissKeyboardShortcutsHelper();

    method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);

    method public boolean dispatchKeyEvent(android.view.KeyEvent);

    method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3541,6 +3541,7 @@ package android.app { 
    method public boolean convertToTranslucent(android.app.Activity.TranslucentConversionListener, android.app.ActivityOptions);

    method public android.app.PendingIntent createPendingResult(int, android.content.Intent, int);

    method public final deprecated void dismissDialog(int);

    method public final void dismissKeyboardShortcutsHelper();

    method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);

    method public boolean dispatchKeyEvent(android.view.KeyEvent);

    method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3424,6 +3424,7 @@ package android.app { 
    method public void closeOptionsMenu();

    method public android.app.PendingIntent createPendingResult(int, android.content.Intent, int);

    method public final deprecated void dismissDialog(int);

    method public final void dismissKeyboardShortcutsHelper();

    method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);

    method public boolean dispatchKeyEvent(android.view.KeyEvent);

    method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);

core/java/android/app/Activity.java

+16 −7
Original line number Diff line number Diff line
@@ -721,6 +721,10 @@ public class Activity extends ContextThemeWrapper 


    private static final String REQUEST_PERMISSIONS_WHO_PREFIX = "@android:requestPermissions:";



    private static final String KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME = "com.android.systemui";

    private static final String KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME =

            "com.android.systemui.statusbar.KeyboardShortcutsReceiver";



    private static class ManagedDialog {

        Dialog mDialog;

        Bundle mArgs;
@@ -1682,8 +1686,18 @@ public class Activity extends ContextThemeWrapper 
     */

    public final void requestKeyboardShortcutsHelper() {

        Intent intent = new Intent(Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS);

        intent.setComponent(new ComponentName("com.android.systemui",

                "com.android.systemui.statusbar.KeyboardShortcutsReceiver"));

        intent.setComponent(new ComponentName(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME,

                KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME));

        sendBroadcast(intent);

    }



    /**

     * Dismiss the Keyboard Shortcuts screen.

     */

    public final void dismissKeyboardShortcutsHelper() {

        Intent intent = new Intent(Intent.ACTION_DISMISS_KEYBOARD_SHORTCUTS);

        intent.setComponent(new ComponentName(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME,

                KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME));

        sendBroadcast(intent);

    }
@@ -1693,11 +1707,6 @@ public class Activity extends ContextThemeWrapper 
        if (menu == null) {

          return;

        }

        final InputDevice inputDevice = InputManager.getInstance().getInputDevice(deviceId);

        if (inputDevice == null) {

            return;

        }

        final KeyCharacterMap keyCharacterMap = inputDevice.getKeyCharacterMap();

        KeyboardShortcutGroup group = null;

        int menuSize = menu.size();

        for (int i = 0; i < menuSize; ++i) {

core/java/android/content/Intent.java

+10 −0
Original line number Diff line number Diff line
@@ -1426,6 +1426,16 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String ACTION_SHOW_KEYBOARD_SHORTCUTS =

            "android.intent.action.SHOW_KEYBOARD_SHORTCUTS";



    /**

     * Activity Action: Dismiss the Keyboard Shortcuts Helper screen.

     * <p>Input: Nothing.

     * <p>Output: Nothing.

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DISMISS_KEYBOARD_SHORTCUTS =

            "android.intent.action.DISMISS_KEYBOARD_SHORTCUTS";



    /**

     * Activity Action: Show settings for managing network data usage of a

     * specific application. Applications should define an activity that offers