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

Merge "Make the Next key navigate between TextViews" into ics-mr1

Browse Source
This commit is contained in:
Gilles Debunne
2011-12-08 11:57:06 -08:00
committed by Android (Google) Code Review
parent 0e7b8020fd 06a8e9b1ce
commit aa4a5713aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/TextView.java
View File

@@ -5514,7 +5514,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
* call performClick(), but that won't do anything in * call performClick(), but that won't do anything in
* this case.) * this case.)
*/ */
if (hasOnClickListeners()) { if (!hasOnClickListeners()) {
if (mMovement != null && mText instanceof Editable if (mMovement != null && mText instanceof Editable
&& mLayout != null && onCheckIsTextEditor()) { && mLayout != null && onCheckIsTextEditor()) {
InputMethodManager imm = InputMethodManager.peekInstance(); InputMethodManager imm = InputMethodManager.peekInstance();
@@ -5551,7 +5551,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
* call performClick(), but that won't do anything in * call performClick(), but that won't do anything in
* this case.) * this case.)
*/ */
if (hasOnClickListeners()) { if (!hasOnClickListeners()) {
View v = focusSearch(FOCUS_DOWN); View v = focusSearch(FOCUS_DOWN);
if (v != null) { if (v != null) {