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

Merge "Tweak Javadocs of ListPopupWindow.onKeyXXX" into nyc-dev

Browse Source 
am: fa89fbb

* commit 'fa89fbb9c3ebeb212a52227b1ec4c8720d033070':
  Tweak Javadocs of ListPopupWindow.onKeyXXX
This commit is contained in:
Kirill Grouchnikov
2016-03-18 14:52:23 +00:00
committed by android-build-merger
parent bdc4b8ba2a fa89fbb9c3
commit a97cb54f7d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/widget/ListPopupWindow.java
View File

@@ -879,12 +879,13 @@ public class ListPopupWindow implements ShowableListMenu {
/** /**
* Filter key down events. By forwarding key down events to this function, * Filter key down events. By forwarding key down events to this function,
* views using non-modal ListPopupWindow can have it handle key selection of items. * views using non-modal ListPopupWindow can have it handle key selection of items.
* *
* @param keyCode keyCode param passed to the host view's onKeyDown * @param keyCode keyCode param passed to the host view's onKeyDown
* @param event event param passed to the host view's onKeyDown * @param event event param passed to the host view's onKeyDown
* @return true if the event was handled, false if it was ignored. * @return true if the event was handled, false if it was ignored.
* *
* @see #setModal(boolean) * @see #setModal(boolean)
* @see #onKeyUp(int, KeyEvent)
*/ */
public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) { public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) {
// when the drop down is shown, we drive it directly // when the drop down is shown, we drive it directly
@@ -972,14 +973,15 @@ public class ListPopupWindow implements ShowableListMenu {
} }
/** /**
* Filter key down events. By forwarding key up events to this function, * Filter key up events. By forwarding key up events to this function,
* views using non-modal ListPopupWindow can have it handle key selection of items. * views using non-modal ListPopupWindow can have it handle key selection of items.
* *
* @param keyCode keyCode param passed to the host view's onKeyUp * @param keyCode keyCode param passed to the host view's onKeyUp
* @param event event param passed to the host view's onKeyUp * @param event event param passed to the host view's onKeyUp
* @return true if the event was handled, false if it was ignored. * @return true if the event was handled, false if it was ignored.
* *
* @see #setModal(boolean) * @see #setModal(boolean)
* @see #onKeyDown(int, KeyEvent)
*/ */
public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) { public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
if (isShowing() && mDropDownList.getSelectedItemPosition() >= 0) { if (isShowing() && mDropDownList.getSelectedItemPosition() >= 0) {
@@ -998,11 +1000,11 @@ public class ListPopupWindow implements ShowableListMenu {
* Filter pre-IME key events. By forwarding {@link View#onKeyPreIme(int, KeyEvent)} * Filter pre-IME key events. By forwarding {@link View#onKeyPreIme(int, KeyEvent)}
* events to this function, views using ListPopupWindow can have it dismiss the popup * events to this function, views using ListPopupWindow can have it dismiss the popup
* when the back key is pressed. * when the back key is pressed.
* *
* @param keyCode keyCode param passed to the host view's onKeyPreIme * @param keyCode keyCode param passed to the host view's onKeyPreIme
* @param event event param passed to the host view's onKeyPreIme * @param event event param passed to the host view's onKeyPreIme
* @return true if the event was handled, false if it was ignored. * @return true if the event was handled, false if it was ignored.
* *
* @see #setModal(boolean) * @see #setModal(boolean)
*/ */
public boolean onKeyPreIme(int keyCode, @NonNull KeyEvent event) { public boolean onKeyPreIme(int keyCode, @NonNull KeyEvent event) {