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

* commit 'aa4a5713aab73cf7c9486cd587a0d986a8daf7e3':
  Make the Next key navigate between TextViews
This commit is contained in:
Gilles Debunne
2011-12-08 11:58:33 -08:00
committed by Android Git Automerger

View File

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