diff options
| author | 2016-05-16 15:08:09 +0000 | |
|---|---|---|
| committer | 2016-05-16 15:08:09 +0000 | |
| commit | f76e417c5205ea13445395d2fd531abbbc730446 (patch) | |
| tree | c0a405455fc9683b0dbe78c2f3eef22b954e6eb5 | |
| parent | c78bae6dab687054acad2f9ec642d1e99188097c (diff) | |
| parent | d34396443e712a96572d26c820809a9485e57da3 (diff) | |
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
am: d34396443e
* commit 'd34396443e712a96572d26c820809a9485e57da3':
Rename requestKeyboardShortcutsHelper
Change-Id: I6fb4ae2c7b39b24fb4b9c916552bd9fb4534f546
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 58e92208a18f..f37f02310f44 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3580,8 +3580,8 @@ package android.app { method public final deprecated void removeDialog(int); method public void reportFullyDrawn(); 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 requestShowKeyboardShortcuts(); method public boolean requestVisibleBehind(boolean); method public final boolean requestWindowFeature(int); method public final void runOnUiThread(java.lang.Runnable); diff --git a/api/system-current.txt b/api/system-current.txt index 342d29b2a792..94267de1856a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3708,8 +3708,8 @@ package android.app { method public final deprecated void removeDialog(int); method public void reportFullyDrawn(); 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 requestShowKeyboardShortcuts(); method public boolean requestVisibleBehind(boolean); method public final boolean requestWindowFeature(int); method public final void runOnUiThread(java.lang.Runnable); diff --git a/api/test-current.txt b/api/test-current.txt index 50db2b2d5811..218c3c83f84f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3580,8 +3580,8 @@ package android.app { method public final deprecated void removeDialog(int); method public void reportFullyDrawn(); 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 requestShowKeyboardShortcuts(); method public boolean requestVisibleBehind(boolean); method public final boolean requestWindowFeature(int); method public final void runOnUiThread(java.lang.Runnable); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 0726c430a78b..fecfdaec74bc 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1691,7 +1691,7 @@ public class Activity extends ContextThemeWrapper * 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() { + public final void requestShowKeyboardShortcuts() { Intent intent = new Intent(Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS); intent.setComponent(new ComponentName(KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME, KEYBOARD_SHORTCUTS_RECEIVER_CLASS_NAME)); |