Merge "Re-added a flag to prevent the IME from showing"

Author: Gilles Debunne

core/java/android/widget/Editor.java

@@ -151,6 +151,7 @@ public class Editor {
     boolean mShowErrorAfterAttach;
 
     boolean mInBatchEditControllers;
+    boolean mShowSoftInputOnFocus = true;
 
     SuggestionsPopupWindow mSuggestionsPopupWindow;
     SuggestionRangeSpan mSuggestionRangeSpan;
@@ -1437,7 +1438,7 @@ boolean startSelectionActionMode() {
         }
 
         final boolean selectionStarted = mSelectionActionMode != null || willExtract;
-        if (selectionStarted && !mTextView.isTextSelectable()) {
+        if (selectionStarted && !mTextView.isTextSelectable() && mShowSoftInputOnFocus) {
             // Show the IME to be able to replace text, except when selecting non editable text.
             final InputMethodManager imm = InputMethodManager.peekInstance();
             if (imm != null) {

core/java/android/widget/TextView.java

@@ -2311,6 +2311,27 @@ public void setHighlightColor(int color) {
         }
     }
 
+    /**
+     * Sets whether the soft input method will be made visible when this
+     * TextView gets focused. The default is true.
+     * @hide
+     */
+    @android.view.RemotableViewMethod
+    public final void setShowSoftInputOnFocus(boolean show) {
+        createEditorIfNeeded("setShowSoftInputOnFocus");
+        mEditor.mShowSoftInputOnFocus = show;
+    }
+
+    /**
+     * Returns whether the soft input method will be made visible when this
+     * TextView gets focused. The default is true.
+     * @hide
+     */
+    public final boolean getShowSoftInputOnFocus() {
+        // When there is no Editor, return default true value
+        return mEditor == null || mEditor.mShowSoftInputOnFocus;
+    }
+
     /**
      * Gives the text a shadow of the specified radius and color, the specified
      * distance from its normal position.
@@ -4981,7 +5002,7 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
                                 && mLayout != null && onCheckIsTextEditor()) {
                             InputMethodManager imm = InputMethodManager.peekInstance();
                             viewClicked(imm);
-                            if (imm != null) {
+                            if (imm != null && getShowSoftInputOnFocus()) {
                                 imm.showSoftInput(this, 0);
                             }
                         }
@@ -7014,7 +7035,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 // Show the IME, except when selecting in read-only text.
                 final InputMethodManager imm = InputMethodManager.peekInstance();
                 viewClicked(imm);
-                if (!textIsSelectable) {
+                if (!textIsSelectable && mEditor.mShowSoftInputOnFocus) {
                     handled |= imm != null && imm.showSoftInput(this, 0);
                 }