Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev

Browse Source
This commit is contained in:
Clara Bayarri
2016-05-16 15:01:26 +00:00
committed by Android (Google) Code Review
parent 8698ad8411 ac6f034f2a
commit d34396443e
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

2
api/system-current.txt
View File

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

2
api/test-current.txt
View File

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

2
core/java/android/app/Activity.java
View File

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