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

* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
  Make the Next key navigate between TextViews
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index db9629a..5b73a74 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5517,7 +5517,7 @@
                      * 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();
@@ -5554,7 +5554,7 @@
                          * call performClick(), but that won't do anything in
                          * this case.)
                          */
-                        if (hasOnClickListeners()) {
+                        if (!hasOnClickListeners()) {
                             View v = focusSearch(FOCUS_DOWN);
 
                             if (v != null) {