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

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

Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d3439644 

am: f76e417c

* commit 'f76e417c':
  Rename requestKeyboardShortcutsHelper

Change-Id: Iaeefd593861efdbea1c6fc5f8493ebc6e3310d16
parents 3d1d72af f76e417c

api/current.txt

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

    method public final deprecated void removeDialog(int);

    method public void reportFullyDrawn();

    method public void reportFullyDrawn();

    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);

    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);

    method public final void requestKeyboardShortcutsHelper();

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

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

    method public final void requestShowKeyboardShortcuts();

    method public boolean requestVisibleBehind(boolean);

    method public boolean requestVisibleBehind(boolean);

    method public final boolean requestWindowFeature(int);

    method public final boolean requestWindowFeature(int);

    method public final void runOnUiThread(java.lang.Runnable);

    method public final void runOnUiThread(java.lang.Runnable);

api/system-current.txt

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

    method public final deprecated void removeDialog(int);

    method public void reportFullyDrawn();

    method public void reportFullyDrawn();

    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);

    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);

    method public final void requestKeyboardShortcutsHelper();

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

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

    method public final void requestShowKeyboardShortcuts();

    method public boolean requestVisibleBehind(boolean);

    method public boolean requestVisibleBehind(boolean);

    method public final boolean requestWindowFeature(int);

    method public final boolean requestWindowFeature(int);

    method public final void runOnUiThread(java.lang.Runnable);

    method public final void runOnUiThread(java.lang.Runnable);

api/test-current.txt

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

    method public final deprecated void removeDialog(int);

    method public void reportFullyDrawn();

    method public void reportFullyDrawn();

    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);

    method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);

    method public final void requestKeyboardShortcutsHelper();

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

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

    method public final void requestShowKeyboardShortcuts();

    method public boolean requestVisibleBehind(boolean);

    method public boolean requestVisibleBehind(boolean);

    method public final boolean requestWindowFeature(int);

    method public final boolean requestWindowFeature(int);

    method public final void runOnUiThread(java.lang.Runnable);

    method public final void runOnUiThread(java.lang.Runnable);

core/java/android/app/Activity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1691,7 +1691,7 @@ public class Activity extends ContextThemeWrapper 
     * Request the Keyboard Shortcuts screen to show up. If it succeeds, this will trigger

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

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

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

     */

     */

    public final void requestKeyboardShortcutsHelper() {

    public final void requestShowKeyboardShortcuts() {

        Intent intent = new Intent(Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS);

        Intent intent = new Intent(Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS);

        intent.setComponent(new ComponentName(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME,

        intent.setComponent(new ComponentName(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME,

                KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME));

                KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME));