Do not open the keyboard when opening Find from CAB.

Bug:3312049

Do not start Find on page if the action mode fails to
start.  Clean up showFindDialog.

Requires a change to packages/apps/Browser

Change-Id: I204315665d3bf9f3ac78e78c4059c5a6f24695db

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/android/webkit/FindActionModeCallback.java b/core/java/android/webkit/FindActionModeCallback.java
index 7c2598740c40..1a7b0d2191eb 100644
--- a/core/java/android/webkit/FindActionModeCallback.java
+++ b/core/java/android/webkit/FindActionModeCallback.java
@@ -134,6 +134,10 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
         }
     }
 
+    public void showSoftInput() {
+        mInput.showSoftInput(mEditText, 0);
+    }
+
     /*
      * Update the string which tells the user how many matches were found, and
      * which match is currently highlighted.
@@ -165,7 +169,6 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
         mMatchesFound = false;
         mMatches.setText("0");
         mEditText.requestFocus();
-        mInput.showSoftInput(mEditText, 0);
         return true;
     }