Merge "TextViews keep focus after Done" into ics-mr1

Author: Gilles Debunne

core/java/android/widget/TextView.java

@@ -3785,7 +3785,7 @@ public void onEditorAction(int actionCode) {
                     return;
                 }
             }
-            
+
             // This is the handling for some default action.
             // Note that for backwards compatibility we don't do this
             // default handling if explicit ime options have not been given,
@@ -3816,7 +3816,6 @@ public void onEditorAction(int actionCode) {
                 if (imm != null && imm.isActive(this)) {
                     imm.hideSoftInputFromWindow(getWindowToken(), 0);
                 }
-                clearFocus();
                 return;
             }
         }
@@ -3838,7 +3837,7 @@ public void onEditorAction(int actionCode) {
                     | KeyEvent.FLAG_EDITOR_ACTION)));
         }
     }
-    
+
     /**
      * Set the private content type of the text, which is the
      * {@link EditorInfo#privateImeOptions EditorInfo.privateImeOptions}