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

Commit 3f192435 authored by Clara Bayarri's avatar Clara Bayarri Committed by android-build-merger
Browse files

Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev 

am: 738ab04f

* commit '738ab04f':
  Expose the Keyboard Shortcuts Helper in Activity

Change-Id: I94122c113dd2eb8b02f21563f50d898f89db5515
parents 73e25273 738ab04f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3578,6 +3578,7 @@ package android.app { 
    method public final deprecated void removeDialog(int);

    method public void reportFullyDrawn();

    method public android.view.DropPermissions requestDropPermissions(android.view.DragEvent);

    method public final void requestKeyboardShortcutsHelper();

    method public final void requestPermissions(java.lang.String[], int);

    method public boolean requestVisibleBehind(boolean);

    method public final boolean requestWindowFeature(int);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3696,6 +3696,7 @@ package android.app { 
    method public final deprecated void removeDialog(int);

    method public void reportFullyDrawn();

    method public android.view.DropPermissions requestDropPermissions(android.view.DragEvent);

    method public final void requestKeyboardShortcutsHelper();

    method public final void requestPermissions(java.lang.String[], int);

    method public boolean requestVisibleBehind(boolean);

    method public final boolean requestWindowFeature(int);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3578,6 +3578,7 @@ package android.app { 
    method public final deprecated void removeDialog(int);

    method public void reportFullyDrawn();

    method public android.view.DropPermissions requestDropPermissions(android.view.DragEvent);

    method public final void requestKeyboardShortcutsHelper();

    method public final void requestPermissions(java.lang.String[], int);

    method public boolean requestVisibleBehind(boolean);

    method public final boolean requestWindowFeature(int);

core/java/android/app/Activity.java

+11 −0
Original line number Diff line number Diff line
@@ -1676,6 +1676,17 @@ public class Activity extends ContextThemeWrapper 
    public void onProvideAssistContent(AssistContent outContent) {

    }



    /**

     * Request the Keyboard Shortcuts screen to show up. If it succeeds, this will trigger

     * {@link #onProvideKeyboardShortcuts} to retrieve the shortcuts for the foreground activity.

     */

    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"));

        sendBroadcast(intent);

    }



    @Override

    public void onProvideKeyboardShortcuts(

            List<KeyboardShortcutGroup> data, Menu menu, int deviceId) {

core/java/android/content/Intent.java

+10 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,16 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP";



    /**

     * Activity Action: Start the Keyboard Shortcuts Helper screen.

     * <p>Input: Nothing.

     * <p>Output: Nothing.

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_SHOW_KEYBOARD_SHORTCUTS =

            "android.intent.action.SHOW_KEYBOARD_SHORTCUTS";



    /**

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

     * specific application. Applications should define an activity that offers