diff options
| author | Scott Kennedy <skennedy@google.com> | 2013-02-15 17:54:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-15 17:54:02 +0000 |
| commit | b305f499d4a2f7fe783cc11ecf68eab70a8c6d83 (patch) | |
| tree | d777d0c928d372e6b0b59d9cc1be911289c8dedd /chips | |
| parent | a90eaa29effcb64a96847ad07173032d7ca3be41 (diff) | |
| parent | 348c459fd722f115ffeb3d5cec5950088fa1bde8 (diff) | |
| download | android_frameworks_ex-b305f499d4a2f7fe783cc11ecf68eab70a8c6d83.tar.gz android_frameworks_ex-b305f499d4a2f7fe783cc11ecf68eab70a8c6d83.tar.bz2 android_frameworks_ex-b305f499d4a2f7fe783cc11ecf68eab70a8c6d83.zip | |
Merge "Don't jump focus out of the View when the Activity starts" into jb-ub-mail-ur9
Diffstat (limited to 'chips')
| -rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 953aa46..998cf8d 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -1077,20 +1077,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements @Override public boolean onKeyUp(int keyCode, KeyEvent event) { switch (keyCode) { - case KeyEvent.KEYCODE_ENTER: - case KeyEvent.KEYCODE_DPAD_CENTER: - if (event.hasNoModifiers()) { - if (commitDefault()) { - return true; - } - if (mSelectedChip != null) { - clearSelectedChip(); - return true; - } else if (focusNext()) { - return true; - } - } - break; case KeyEvent.KEYCODE_TAB: if (event.hasNoModifiers()) { if (mSelectedChip != null) { @@ -1282,6 +1268,23 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements removeChip(mSelectedChip); } + switch (keyCode) { + case KeyEvent.KEYCODE_ENTER: + case KeyEvent.KEYCODE_DPAD_CENTER: + if (event.hasNoModifiers()) { + if (commitDefault()) { + return true; + } + if (mSelectedChip != null) { + clearSelectedChip(); + return true; + } else if (focusNext()) { + return true; + } + } + break; + } + return super.onKeyDown(keyCode, event); } |