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

am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev

Browse Source 
* commit '268f858be57089e568bc55aa9089af54a53dcc94':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
This commit is contained in:
Justin Koh
2014-05-05 23:18:22 +00:00
committed by Android Git Automerger
parent e0cc71fa19 268f858be5
commit 7b529fcd6d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -26738,10 +26738,8 @@ package android.view {
method public final boolean hasModifiers(int); method public final boolean hasModifiers(int);
method public final boolean hasNoModifiers(); method public final boolean hasNoModifiers();
method public final boolean isAltPressed(); method public final boolean isAltPressed();
method public final boolean isCancelKey();
method public final boolean isCanceled(); method public final boolean isCanceled();
method public final boolean isCapsLockOn(); method public final boolean isCapsLockOn();
method public final boolean isConfirmKey();
method public final boolean isCtrlPressed(); method public final boolean isCtrlPressed();
method public final boolean isFunctionPressed(); method public final boolean isFunctionPressed();
method public static final boolean isGamepadButton(int); method public static final boolean isGamepadButton(int);

2
core/java/android/view/KeyEvent.java
View File

@@ -1855,6 +1855,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
* Returns true if the key event should be treated as a confirming action. * Returns true if the key event should be treated as a confirming action.
* @return True for a confirmation key, such as {@link #KEYCODE_DPAD_CENTER}, * @return True for a confirmation key, such as {@link #KEYCODE_DPAD_CENTER},
* {@link #KEYCODE_ENTER}, or {@link #KEYCODE_BUTTON_A}. * {@link #KEYCODE_ENTER}, or {@link #KEYCODE_BUTTON_A}.
* @hide
*/ */
public final boolean isConfirmKey() { public final boolean isConfirmKey() {
switch (mKeyCode) { switch (mKeyCode) {
@@ -1871,6 +1872,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
* Returns true if the key event should be treated as a cancelling action. * Returns true if the key event should be treated as a cancelling action.
* @return True for a cancellation key, such as {@link #KEYCODE_ESCAPE}, * @return True for a cancellation key, such as {@link #KEYCODE_ESCAPE},
* {@link #KEYCODE_BACK}, or {@link #KEYCODE_BUTTON_B}. * {@link #KEYCODE_BACK}, or {@link #KEYCODE_BUTTON_B}.
* @hide
*/ */
public final boolean isCancelKey() { public final boolean isCancelKey() {
switch (mKeyCode) { switch (mKeyCode) {