From fe026bdd3c0fd7543ceaf0732aeb824cfddb5b23 Mon Sep 17 00:00:00 2001
From: Leon Scroggins <scroggo@google.com>
Date: Tue, 24 Aug 2010 14:16:09 -0400
Subject: [PATCH] Move Find on page and Select ActionModes to framework.

Bug: 2938052

Requires a change to packages/apps/Browser

Change-Id: I1bb1a47610b06c4bb02ef08647c02cc1dcaddb15
---
 api/current.xml                               |  30 +++
 core/java/android/provider/Browser.java       |   5 +-
 .../webkit/FindActionModeCallback.java        | 224 ++++++++++++++++++
 .../webkit/SelectActionModeCallback.java      |  92 +++++++
 core/java/android/webkit/WebChromeClient.java |  17 --
 core/java/android/webkit/WebView.java         | 126 ++++++----
 .../res/drawable-hdpi/ic_btn_find_next.png    | Bin 0 -> 1099 bytes
 .../res/drawable-hdpi/ic_btn_find_prev.png    | Bin 0 -> 912 bytes
 core/res/res/drawable-hdpi/ic_menu_find.png   | Bin 0 -> 3442 bytes
 .../res/drawable-mdpi/ic_btn_find_next.png    | Bin 0 -> 592 bytes
 .../res/drawable-mdpi/ic_btn_find_prev.png    | Bin 0 -> 615 bytes
 core/res/res/drawable-mdpi/ic_menu_find.png   | Bin 0 -> 2048 bytes
 core/res/res/layout/webview_find.xml          |  39 +++
 core/res/res/menu/webview_copy.xml            |  35 +++
 core/res/res/menu/webview_find.xml            |  26 ++
 core/res/res/values/strings.xml               |  17 ++
 16 files changed, 549 insertions(+), 62 deletions(-)
 create mode 100644 core/java/android/webkit/FindActionModeCallback.java
 create mode 100644 core/java/android/webkit/SelectActionModeCallback.java
 create mode 100644 core/res/res/drawable-hdpi/ic_btn_find_next.png
 create mode 100644 core/res/res/drawable-hdpi/ic_btn_find_prev.png
 create mode 100644 core/res/res/drawable-hdpi/ic_menu_find.png
 create mode 100644 core/res/res/drawable-mdpi/ic_btn_find_next.png
 create mode 100644 core/res/res/drawable-mdpi/ic_btn_find_prev.png
 create mode 100644 core/res/res/drawable-mdpi/ic_menu_find.png
 create mode 100644 core/res/res/layout/webview_find.xml
 create mode 100644 core/res/res/menu/webview_copy.xml
 create mode 100644 core/res/res/menu/webview_find.xml

diff --git a/api/current.xml b/api/current.xml
index 42733607ff593..e2e1346f1bd59 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -15782,6 +15782,23 @@
 >
 </field>
 </class>
+<class name="R.menu"
+ extends="java.lang.Object"
+ abstract="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<constructor name="R.menu"
+ type="android.R.menu"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</constructor>
+</class>
 <class name="R.plurals"
  extends="java.lang.Object"
  abstract="false"
@@ -215998,6 +216015,19 @@
 <parameter name="client" type="android.webkit.WebViewClient">
 </parameter>
 </method>
+<method name="showFindDialog"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="text" type="java.lang.String">
+</parameter>
+</method>
 <method name="stopLoading"
  return="void"
  abstract="false"
diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java
index 4422113c55b29..c8e5921f128b7 100644
--- a/core/java/android/provider/Browser.java
+++ b/core/java/android/provider/Browser.java
@@ -209,7 +209,10 @@ public class Browser {
         send.putExtra(Intent.EXTRA_TEXT, stringToSend);
 
         try {
-            c.startActivity(Intent.createChooser(send, chooserDialogTitle));
+            Intent i = Intent.createChooser(send, chooserDialogTitle);
+            // In case this is called from outside an Activity
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            c.startActivity(i);
         } catch(android.content.ActivityNotFoundException ex) {
             // if no app handles it, do nothing
         }
diff --git a/core/java/android/webkit/FindActionModeCallback.java b/core/java/android/webkit/FindActionModeCallback.java
new file mode 100644
index 0000000000000..2299d4a0f04f4
--- /dev/null
+++ b/core/java/android/webkit/FindActionModeCallback.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.webkit;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.text.Editable;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.TextWatcher;
+import android.webkit.WebView;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.view.ActionMode;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
+        View.OnLongClickListener {
+    private View mCustomView;
+    private EditText mEditText;
+    private TextView mMatches;
+    private WebView mWebView;
+    private InputMethodManager mInput;
+    private Resources mResources;
+    private boolean mMatchesFound;
+    private int mNumberOfMatches;
+    private View mTitleBar;
+
+    FindActionModeCallback(Context context) {
+        mCustomView = LayoutInflater.from(context).inflate(
+                com.android.internal.R.layout.webview_find, null);
+        mEditText = (EditText) mCustomView.findViewById(
+                com.android.internal.R.id.edit);
+        // Override long click so that select ActionMode is not opened, which
+        // would exit find ActionMode.
+        mEditText.setOnLongClickListener(this);
+        setText("");
+        mMatches = (TextView) mCustomView.findViewById(
+                com.android.internal.R.id.matches);
+        mInput = (InputMethodManager)
+                context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        mResources = context.getResources();
+    }
+
+    void setTitleBar(View v) { mTitleBar = v; }
+
+    /*
+     * Place text in the text field so it can be searched for.  Need to press
+     * the find next or find previous button to find all of the matches.
+     */
+    void setText(String text) {
+        mEditText.setText(text);
+        Spannable span = (Spannable) mEditText.getText();
+        int length = span.length();
+        // Ideally, we would like to set the selection to the whole field,
+        // but this brings up the Text selection CAB, which dismisses this
+        // one.
+        Selection.setSelection(span, length, length);
+        // Necessary each time we set the text, so that this will watch
+        // changes to it.
+        span.setSpan(this, 0, length, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        mMatchesFound = false;
+    }
+
+    /*
+     * Set the WebView to search.  Must be non null, and set before calling
+     * startActionMode.
+     */
+    void setWebView(WebView webView) {
+        if (null == webView) {
+            throw new AssertionError("WebView supplied to "
+                    + "FindActionModeCallback cannot be null");
+        }
+        mWebView = webView;
+    }
+
+    /*
+     * Move the highlight to the next match.
+     * @param next If true, find the next match further down in the document.
+     *             If false, find the previous match, up in the document.
+     */
+    private void findNext(boolean next) {
+        if (mWebView == null) {
+            throw new AssertionError(
+                    "No WebView for FindActionModeCallback::findNext");
+        }
+        mWebView.findNext(next);
+    }
+
+    /*
+     * Highlight all the instances of the string from mEditText in mWebView.
+     */
+    void findAll() {
+        if (mWebView == null) {
+            throw new AssertionError(
+                    "No WebView for FindActionModeCallback::findAll");
+        }
+        CharSequence find = mEditText.getText();
+        if (0 == find.length()) {
+            mWebView.clearMatches();
+            mMatches.setVisibility(View.GONE);
+            mMatchesFound = false;
+        } else {
+            mMatchesFound = true;
+            mMatches.setVisibility(View.VISIBLE);
+            mNumberOfMatches = mWebView.findAll(find.toString());
+            if (0 == mNumberOfMatches) {
+                mMatches.setText(mResources.getString(
+                        com.android.internal.R.string.no_matches));
+            } else {
+                updateMatchesString();
+            }
+        }
+    }
+
+    /*
+     * Update the string which tells the user how many matches were found, and
+     * which match is currently highlighted.
+     */
+    private void updateMatchesString() {
+        String template = mResources.getQuantityString(
+                com.android.internal.R.plurals.matches_found, mNumberOfMatches,
+                mWebView.findIndex() + 1, mNumberOfMatches);
+
+        mMatches.setText(template);
+    }
+
+    // OnLongClickListener implementation
+
+    @Override
+    public boolean onLongClick(View v) { return true; }
+
+    // ActionMode.Callback implementation
+
+    @Override
+    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+        mode.setCustomView(mCustomView);
+        mode.getMenuInflater().inflate(com.android.internal.R.menu.webview_find,
+                menu);
+        Editable edit = mEditText.getText();
+        Selection.setSelection(edit, edit.length());
+        mMatches.setVisibility(View.GONE);
+        mMatchesFound = false;
+        mMatches.setText("0");
+        mEditText.requestFocus();
+        mInput.showSoftInput(mEditText, 0);
+        return true;
+    }
+
+    @Override
+    public void onDestroyActionMode(ActionMode mode) {
+        if (mTitleBar != null) mWebView.setEmbeddedTitleBar(mTitleBar);
+        mWebView.notifyFindDialogDismissed();
+        mInput.hideSoftInputFromWindow(mWebView.getWindowToken(), 0);
+    }
+
+    @Override
+    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+        return false;
+    }
+
+    @Override
+    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+        if (!mMatchesFound) {
+            findAll();
+            return true;
+        }
+        switch(item.getItemId()) {
+            case com.android.internal.R.id.find_prev:
+                findNext(false);
+                break;
+            case com.android.internal.R.id.find_next:
+                findNext(true);
+                break;
+            default:
+                return false;
+        }
+        updateMatchesString();
+        return true;
+    }
+
+    // TextWatcher implementation
+
+    @Override
+    public void beforeTextChanged(CharSequence s,
+                                  int start,
+                                  int count,
+                                  int after) {
+        // Does nothing.  Needed to implement TextWatcher.
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s,
+                              int start,
+                              int before,
+                              int count) {
+        findAll();
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        // Does nothing.  Needed to implement TextWatcher.
+    }
+
+}
diff --git a/core/java/android/webkit/SelectActionModeCallback.java b/core/java/android/webkit/SelectActionModeCallback.java
new file mode 100644
index 0000000000000..cf919022d0227
--- /dev/null
+++ b/core/java/android/webkit/SelectActionModeCallback.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.webkit;
+
+import android.provider.Browser;
+import android.webkit.WebView;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+class SelectActionModeCallback implements ActionMode.Callback {
+    private WebView mWebView;
+    private View mTitleBar;
+    private ActionMode mActionMode;
+
+    void setWebView(WebView webView) {
+        mWebView = webView;
+    }
+
+    void setTitleBar(View v) { mTitleBar = v; }
+
+    void finish() {
+        mActionMode.finish();
+    }
+
+    // ActionMode.Callback implementation
+
+    @Override
+    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+        mode.getMenuInflater().inflate(com.android.internal.R.menu.webview_copy,
+                menu);
+        mode.setTitle(com.android.internal.R.string.textSelectionCABTitle);
+        mActionMode = mode;
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+        return true;
+    }
+
+    @Override
+    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+        switch(item.getItemId()) {
+            case android.R.id.copy:
+                mWebView.copySelection();
+                mode.finish();
+                break;
+
+            case com.android.internal.R.id.share:
+                String selection = mWebView.getSelection();
+                Browser.sendString(mWebView.getContext(), selection);
+                mode.finish();
+                break;
+
+            case com.android.internal.R.id.select_all:
+                mWebView.selectAll();
+                break;
+
+            case com.android.internal.R.id.find:
+                String sel= mWebView.getSelection();
+                mode.finish();
+                mWebView.showFindDialog(sel);
+                break;
+
+            default:
+                return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void onDestroyActionMode(ActionMode mode) {
+        if (mTitleBar != null) mWebView.setEmbeddedTitleBar(mTitleBar);
+        mWebView.selectionDone();
+    }
+}
diff --git a/core/java/android/webkit/WebChromeClient.java b/core/java/android/webkit/WebChromeClient.java
index e83bef0f3ec51..b2ba7e233fc7c 100644
--- a/core/java/android/webkit/WebChromeClient.java
+++ b/core/java/android/webkit/WebChromeClient.java
@@ -323,23 +323,6 @@ public class WebChromeClient {
         uploadFile.onReceiveValue(null);
     }
 
-    /**
-     * Tell the client that the selection has been initiated.
-     * @hide
-     */
-    public void onSelectionStart(WebView view) {
-        // By default we cancel the selection again, thus disabling
-        // text selection unless the chrome client supports it.
-        view.notifySelectDialogDismissed();
-    }
-
-    /**
-     * Tell the client that the selection has been copied or canceled.
-     * @hide
-     */
-    public void onSelectionDone(WebView view) {
-    }
-
     /**
      * Tell the client that the page being viewed is web app capable,
      * i.e. has specified the fullscreen-web-app-capable meta tag.
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 7d6ca8d358941..d4ef0f0a443cf 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2114,6 +2114,15 @@ public class WebView extends AbsoluteLayout
      * @hide
      */
     public void setEmbeddedTitleBar(View v) {
+        if (null == v) {
+            // If one of our callbacks is holding onto the titlebar to replace
+            // it when its ActionMode ends, remove it.
+            if (mSelectCallback != null) {
+                mSelectCallback.setTitleBar(null);
+            } else if (mFindCallback != null) {
+                mFindCallback.setTitleBar(null);
+            }
+        }
         if (mTitleBar == v) return;
         if (mTitleBar != null) {
             removeView(mTitleBar);
@@ -2679,18 +2688,49 @@ public class WebView extends AbsoluteLayout
     }
 
     /**
-     * @hide
+     * Start an ActionMode for finding text in this WebView.
+     * @param text If non-null, will be the initial text to search for.
+     *             Otherwise, the last String searched for in this WebView will
+     *             be used to start.
      */
-    public void setFindIsUp(boolean isUp) {
+    public void showFindDialog(String text) {
+        mFindCallback = new FindActionModeCallback(mContext);
+        setFindIsUp(true);
+        mFindCallback.setWebView(this);
+        View titleBar = mTitleBar;
+        // We do not want to show the embedded title bar during find or
+        // select, but keep track of it so that it can be replaced when the
+        // mode is exited.
+        setEmbeddedTitleBar(null);
+        mFindCallback.setTitleBar(titleBar);
+        startActionMode(mFindCallback);
+        if (text == null) {
+            text = mLastFind;
+        }
+        if (text != null) {
+            mFindCallback.setText(text);
+        }
+    }
+
+    /**
+     * Keep track of the find callback so that we can remove its titlebar if
+     * necessary.
+     */
+    private FindActionModeCallback mFindCallback;
+
+    /**
+     * Toggle whether the find dialog is showing, for both native and Java.
+     */
+    private void setFindIsUp(boolean isUp) {
         mFindIsUp = isUp;
         if (0 == mNativeClass) return; // client isn't initialized
         nativeSetFindIsUp(isUp);
     }
 
     /**
-     * @hide
+     * Return the index of the currently highlighted match.
      */
-    public int findIndex() {
+    int findIndex() {
         if (0 == mNativeClass) return -1;
         return nativeFindIndex();
     }
@@ -2699,8 +2739,8 @@ public class WebView extends AbsoluteLayout
     // or not we draw the highlights for matches.
     private boolean mFindIsUp;
 
-    // Keep track of the last string sent, so we can search again after an
-    // orientation change or the dismissal of the soft keyboard.
+    // Keep track of the last string sent, so we can search again when find is
+    // reopened.
     private String mLastFind;
 
     /**
@@ -2757,7 +2797,6 @@ public class WebView extends AbsoluteLayout
      * Clear the highlighting surrounding text matches created by findAll.
      */
     public void clearMatches() {
-        mLastFind = "";
         if (mNativeClass == 0)
             return;
         nativeSetFindIsEmpty();
@@ -2765,9 +2804,10 @@ public class WebView extends AbsoluteLayout
     }
 
     /**
-     * @hide
+     * Called when the find ActionMode ends.
      */
-    public void notifyFindDialogDismissed() {
+    void notifyFindDialogDismissed() {
+        mFindCallback = null;
         if (mWebViewCore == null) {
             return;
         }
@@ -3359,14 +3399,18 @@ public class WebView extends AbsoluteLayout
         setUpSelect();
         if (mNativeClass != 0 && nativeWordSelection(x, y)) {
             nativeSetExtendSelection();
-            WebChromeClient client = getWebChromeClient();
-            if (client != null) client.onSelectionStart(this);
             return true;
         }
-        notifySelectDialogDismissed();
+        selectionDone();
         return false;
     }
 
+    /**
+     * Keep track of the Callback so we can end its ActionMode or remove its
+     * titlebar.
+     */
+    private SelectActionModeCallback mSelectCallback;
+
     private boolean didUpdateTextViewBounds(boolean allowIntersect) {
         Rect contentBounds = nativeFocusCandidateNodeBounds();
         Rect vBox = contentToViewRect(contentBounds);
@@ -4113,10 +4157,7 @@ public class WebView extends AbsoluteLayout
         return false;
     }
 
-    /**
-     * @hide pending API council approval.
-     */
-    public void setUpSelect() {
+    private void setUpSelect() {
         if (0 == mNativeClass) return; // client isn't initialized
         if (inFullScreenMode()) return;
         if (mSelectingText) return;
@@ -4137,6 +4178,15 @@ public class WebView extends AbsoluteLayout
             mSelectY = mScrollY + getViewHeightWithTitle() / 2;
         }
         nativeHideCursor();
+        mSelectCallback = new SelectActionModeCallback();
+        mSelectCallback.setWebView(this);
+        View titleBar = mTitleBar;
+        // We do not want to show the embedded title bar during find or
+        // select, but keep track of it so that it can be replaced when the
+        // mode is exited.
+        setEmbeddedTitleBar(null);
+        mSelectCallback.setTitleBar(titleBar);
+        startActionMode(mSelectCallback);
     }
 
     /**
@@ -4148,9 +4198,9 @@ public class WebView extends AbsoluteLayout
     }
 
     /**
-     * @hide pending API council approval.
+     * Select all of the text in this WebView.
      */
-    public void selectAll() {
+    void selectAll() {
         if (0 == mNativeClass) return; // client isn't initialized
         if (inFullScreenMode()) return;
         if (!mSelectingText) setUpSelect();
@@ -4161,36 +4211,24 @@ public class WebView extends AbsoluteLayout
     }
 
     /**
-     * @hide pending API council approval.
+     * Called when the selection has been removed.
      */
-    public boolean selectDialogIsUp() {
-        return mSelectingText;
-    }
-
-    /**
-     * @hide pending API council approval.
-     */
-    public void notifySelectDialogDismissed() {
-        mSelectingText = false;
-        WebViewCore.resumeUpdatePicture(mWebViewCore);
-    }
-
-    /**
-     * @hide pending API council approval.
-     */
-    public void selectionDone() {
+    void selectionDone() {
         if (mSelectingText) {
-            WebChromeClient client = getWebChromeClient();
-            if (client != null) client.onSelectionDone(this);
+            mSelectingText = false;
+            // finish is idempotent, so this is fine even if selectionDone was
+            // called by mSelectCallback.onDestroyActionMode
+            mSelectCallback.finish();
+            mSelectCallback = null;
+            WebViewCore.resumeUpdatePicture(mWebViewCore);
             invalidate(); // redraw without selection
-            notifySelectDialogDismissed();
         }
     }
 
     /**
-     * @hide pending API council approval.
+     * Copy the selection to the clipboard
      */
-    public boolean copySelection() {
+    boolean copySelection() {
         boolean copiedSomething = false;
         String selection = getSelection();
         if (selection != "") {
@@ -4210,9 +4248,9 @@ public class WebView extends AbsoluteLayout
     }
 
     /**
-     * @hide pending API council approval.
+     * Returns the currently highlighted text as a string.
      */
-    public String getSelection() {
+    String getSelection() {
         if (mNativeClass == 0) return "";
         return nativeGetSelection();
     }
@@ -6567,8 +6605,8 @@ public class WebView extends AbsoluteLayout
 
                 case FIND_AGAIN:
                     // Ignore if find has been dismissed.
-                    if (mFindIsUp) {
-                        findAll(mLastFind);
+                    if (mFindIsUp && mFindCallback != null) {
+                        mFindCallback.findAll();
                     }
                     break;
 
diff --git a/core/res/res/drawable-hdpi/ic_btn_find_next.png b/core/res/res/drawable-hdpi/ic_btn_find_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..b696a6bb225424b9fa3f670b8301ba4655cf1053
GIT binary patch
literal 1099
zcmV-R1ho5!P)<h;3K|Lk000e1NJLTq001Wd001or1^@s6EjV&h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#?MXyIRCwC#ncYiMVI0Swy*S^d)A=@E
zn56UNG6=lrCg?vHBq)fcM|a&#QiKFqG`i@%QS=8C1>Htr1VR!NMi*U$=|Byq)9G|N
z?fZS`v6HUpwzD~62Of^+aXaVZ_xJlgzvp)}9UL5pd_Bw}kB<V}e+g$z^$R|q&k_g(
z;_7;Gaxx=;iHQm0l-t|en;sb%IhU_t?ZKGUH0>%cmY0{s{{DV`z_qlrh>D5|yV-1h
zIyN@;Y-?-FF*i3SqS2_}nwjb_6wYKa375+ynwpw~#bUW)wOVHZdTDWSQG`Mvsp6Tz
zDZuLLYSG!*Day*q+yI;c;NA80bz3kP6uY~-XA1|_L}_WM=;-JWjg5^0fVVLBJ|2&I
z2)MDak$X55HU$YNQCC+d+S=L(+=KB6^V-VFidb4&5`fLEa{3!9K$t{ycXtb?(`g6b
zV}$tyOyZcIpBLNP+qs9+-<)ACE-sdCcDvmK_G0cU;H6nsS6367B`aa&Sq=3drD9c8
zmGF2xqP)Dk8GuumzaI{VZ3_zv$IN0V+-dTMD#FF0y}eyDG&B(S2Ii*mnJ$_o5{cv{
ztcd`rAaYKsNI06MsHo@y06${hN3*c9&@6_BRUc0M_0iwS2LKY`l}irRMw;aj%>t7+
zX_l<#Trxlo0@`dgSygBl0D3Vu3xzM|Ea#Htp)!lZ;gGpVv*7y8z`($R{{DWOVQ{BW
zEt!fXB_*P@wN=#D*Hgvo7#{%GWtej5s;D<hZEdYwa$uPASR1Fu$H$v9+6f<3gbz#i
zU~Q&)Q1T0^NiR0B!HnQiEkOx$3Ch{+c3JWO_z++>0T#=+hfqN2Du?w>R903JEQnki
z_Ikaq4Qp^R2`j4x-3q6^LN7A9wzl@u(C#apu(F&{EsQAEyKC6m2T*I}p3iW&RFvbg
zLA4OZ&-iX1b|>GUnCv-DDqm^A{cGElDCr4?r1zs--G*8*Y~|(7gkU`9JgiK5LLrPy
z`auA_<$ey~lu*bw3C6Rba3>jpMV|XPoL>T96i^}N*Urw4gwcZ;9@a#ml{dnQ&!mT9
z5hnfS=H?TX^a@H3rvA9Bhm|Y+@1&o>^&t9Jne^-(^kG!Frr%O!Ev!7a$}@}rya$*&
zfI3Wiy;_7y1uP@Ca(`A+Q^RiS2b?*G5Wb^Y2<Km6R71Zr$=WM09$X?=u%Xy<s4<E#
zhUvywEOyL|`o1;mFLKxuxLmFX0EdT$hI-LBhuIG>zX(THa`0ybm+bwCp~|5Tn1M6<
zG)?=?YdSKKTB+ogVQ}c2F8clc!v#tyq)+;E!+7kSOyU0!1-Js-pW~MR0{};ko}iHa
R-Rl4V002ovPDHLkV1gSM42}Q*

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-hdpi/ic_btn_find_prev.png b/core/res/res/drawable-hdpi/ic_btn_find_prev.png
new file mode 100644
index 0000000000000000000000000000000000000000..5550c5a6ff68935e9ee44a206fc3eb9f3f143b16
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq001Wd001or1^@s6EjV&h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#GD$>1RCwC#nZ0XTVHCz+KcX?3M3Wdb
zW(f(@Nm>$GC}b(Lw6s$PH6JEb5hP3NkkZg8kV0sOPy(4cgiiGjC<F>!x&=zRcFJ1l
zR1AWmrq6Tn(%Tzjz1OSP!50o^QT*{d=RN1#tL5V2LiFpgiatIAxB*<JXKQQArsebY
zUO=VO=`hlJi^cL7`FGza2e5}o-w=1Er>8|<C<iD9(rd)i;o)K7_xpv-W-}iyl}cSh
z`hd7TIXNl3Uax?qQkV+&1PAF5Af9kIEL<*^u-omDYNo+$Zf<&z-XY?nqoZPKYDx?Z
z4N2i}IE2+|H3tr0Hybw2vFJS>kEE6i#^4OsI>$S{ts5H~FYu#Z05dl`J1eLfp`1>q
z6a*tEmD753E0;_rgX~?1yW`{IVq#+Al3IG9I)YnYU%%e~^9O@LF)}jp4;ZuZ0?^KS
zy)H%9-~h$mwTIZIWr09I0wI_T)eKC|T5GOtxV5#lg+|dY(n4BE2&GzT8<j9!gIify
zNg^GwcZEVB!HzH6c$Hde5ZPM8-~h$mb;SB-U9oqmp_FR1QpeDmOC%DD4I38-CHF36
zeYLVteGIcT7K?4O@bTjg7QNgSlxoRCTv_m~jv>nB^ZA!EGc$WsgaC5UH?y%Fs7{o-
z)FBTJ4qinfk)8SZ`3mi1@hjD8*1NPs$KxxP%k5*ESVn_AqpfbYTY^*HMm=H3Y{jy8
zTC3Hf=xGHi$lIz{ExpRw|Fg}W^Wqi?g%c=ui0~APMFD8dBhN5f)h8a0A0sVcqy6gh
z`J`>bR9l;juOFpS={D-`4cBhHHg|2GgUuC8jpyil5Aba8i;%o1rYomX@uXU<MgjMU
zOF+9e_w0!u&oMt&S6A=B-W{k|;RdWM{GQu-g^K&Ib{PtuQAIXv)0I;_N1T?+<tTPM
zsVA~&U)8Kld6ARNX3w!HCot|(XgB9vMmd8`wY7<g#~5=<0Q}zUvY7q~ER)HwC*B$x
z8+%Ked0D7pU%)lq#Z~aI{R}<v5qqNi=-5{;57D?kqSkI;ll}}PwSBph^+#*$?(W*O
meBLtnA7TJEfcty?2rvMu>Bt#Il))+h0000<MNUMnLSTYa|EQDz

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-hdpi/ic_menu_find.png b/core/res/res/drawable-hdpi/ic_menu_find.png
new file mode 100644
index 0000000000000000000000000000000000000000..17ac6948d1436203ef01704e0f5f1f0e11fb251c
GIT binary patch
literal 3442
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
UR`;5PasU7T07*qoM6N<$f^dLgBme*a

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/ic_btn_find_next.png b/core/res/res/drawable-mdpi/ic_btn_find_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdc247731f9332741c3be66427ee795e5d5071f
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000^Q0015c1^@s6GTRQ=0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz@<~KNRCwC#mPu*?Q4of!oo8B6oIrFT
zy7UO~1_@4}E*wD6g(w~%-XOVwZe1mwz}z5x1bgqI5m9hVRg(r0O|<ir5K>UQ9v=Pi
zzxwOF=61Us+#)n^qxgFu-FFjmxm-)5(L8Op+wx#A=wD5d-|y$$ZZ}vgmR>%e?_Ldr
zY9J5@KqL|YyWRd+C=_~EtC3c#C1nteM#155l#0dTD4WglOhMFVN;;iRh{a;0?9OO3
z5-iLdgl3TMZ8jUk<8k15K4CJM-ZPm@f(eKKN^UkAc{H2NGR))g@OV8!*gX?P`!FS`
zZsBkkd_EtKj(ka{(<Nq#j=@5q5Cnrkuv)FXR4VnPx?vALeoQf{0-a6=qA0cy#;@1w
z_Ha0qE&?e_NA=-2?&Lg|%O$^`OeUr2bSmPbE>lJOL5=P8dSN!3396P(aT|@Nb`Pu(
zpxq^$lWa5^f@;?(u*0O~Le~K{@OZUaB`cMR@MAL^Dl!-has%TiESJk<tyYtm+gq>K
z%gcps>n|3IFCnU3M>_*4!P-1mtJOA>gO4Bzj7CyHiI6g?IQt+xTM@-4M8ane2zg_A
zOb~?Zi{}uzYfSd7*XtKS&Qe4jPkR~GL?HV%n@#B|KPRZ<6&)tc=ktE2(@_PX;Qs$q
ee?90!fB^t4OF}k?k(X!y0000<MNUMnLSTX}XZ~sc

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/ic_btn_find_prev.png b/core/res/res/drawable-mdpi/ic_btn_find_prev.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e3da1dbc3a4430947fb4422afad7f706a9ddefa
GIT binary patch
literal 615
zcmV-t0+{`YP)<h;3K|Lk000e1NJLTq000^Q0015c1^@s6GTRQ=0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!2}wjjRCwC#mP=~FU=YVA8sD#o3O*1k
zf@{4&J%MlB#)Y7u81VotUO;c4TUYf4?GbVWj}Q?N6ty$KxM-tEqqY<r_|V12{J#0m
ze@2<Z;Q+r8%mef%pjxfQn@pzhe!uTcr_<4;yX+N^SF6?f!f_nf?RHM<K5Gy%MhG8?
zL?9Rp!g{@in}Vv<Du+_NA>=t8k3%RF0*l20yWQ?~ph~6kWHy@#l1V0$;P?B%>2!kL
z9_s>?%jFEqvhNOugG(e5Kz+gQfMD2ew}58Q%wf{HP%4!Q1o3!0Tq>1<WAgzelmT?~
zRCTeUVzJ1hRAWjWi^ah0c7x4k1BPKvRVXmSphBTAM2HXw1RxrX%2H9|mE=ko2Icd4
z4qrUPq<lCWmYqdX5ricAn$$1|UoK!`-skfHRYMT$kqlAm1zFn=D4kA=WLuO?PD0K)
z2l+`w-&{8s3}!BuE9>=oC3M>9)#r|35Jjic5ph0p=&(6er?^b*=#}p59JN|4akW}y
z(F7vdnj}0|k)9QFabVl+wzOO>b2yw6s*IecR+XNC)!Yn%AV`fyqmJ^8uy^vns==-X
zDbZ{;d-zc&8I@&v7tpb96EX>cB&zNzdus(c@?*2v<Z!U(WPftxO?spj-ELRJU)3yD
zCeoUsrF$0;MZe#d7K;TrvWGIx9{=n9Kj>3{0RVL9LmP6`;eG%B002ovPDHLkV1i`>
B62$-j

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/ic_menu_find.png b/core/res/res/drawable-mdpi/ic_menu_find.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d9634804e1171b0ee21e815c3bfd32461c00bd3
GIT binary patch
literal 2048
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

literal 0
HcmV?d00001

diff --git a/core/res/res/layout/webview_find.xml b/core/res/res/layout/webview_find.xml
new file mode 100644
index 0000000000000..f2edb2bc6701b
--- /dev/null
+++ b/core/res/res/layout/webview_find.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    >
+    <EditText android:id="@+id/edit"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:scrollHorizontally="true"
+        android:inputType="text"
+        android:hint="@string/find_on_page"
+        android:imeOptions="actionDone"
+        android:layout_marginRight="10dip"
+        />
+    <TextView android:id="@+id/matches"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondaryInverse"
+        />
+</LinearLayout>
diff --git a/core/res/res/menu/webview_copy.xml b/core/res/res/menu/webview_copy.xml
new file mode 100644
index 0000000000000..224f54fc6638d
--- /dev/null
+++ b/core/res/res/menu/webview_copy.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/copy"
+        android:icon="@drawable/ic_menu_attachment"
+        android:showAsAction="always"
+        />
+    <item android:id="@+id/share"
+        android:icon="@drawable/ic_menu_share"
+        android:showAsAction="always"
+        />
+    <item android:id="@+id/select_all"
+        android:icon="@drawable/ic_menu_chat_dashboard"
+        android:showAsAction="always"
+        />
+    <item android:id="@+id/find"
+        android:icon="@drawable/ic_menu_find"
+        android:showAsAction="always"
+        />
+</menu>
+
diff --git a/core/res/res/menu/webview_find.xml b/core/res/res/menu/webview_find.xml
new file mode 100644
index 0000000000000..74a40aaa13f78
--- /dev/null
+++ b/core/res/res/menu/webview_find.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/find_prev"
+        android:icon="@drawable/ic_btn_find_prev"
+        android:showAsAction="always"
+        />
+    <item android:id="@+id/find_next"
+        android:icon="@drawable/ic_btn_find_next"
+        android:showAsAction="always"
+        />
+</menu>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index e38a228623a92..e9295f5bdc8af 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2290,4 +2290,21 @@
     <!-- Shown when the users bandwidth is reduced because of excessive data use -->
     <string name="throttled_notification_title">Mobile data limit exceeded</string>
     <string name="throttled_notification_message">Touch to learn more about mobile data use</string>
+
+    <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+    <string name="no_matches">No matches</string>
+
+    <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+    <string name="find_on_page">Find on page</string>
+
+    <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+    <plurals name="matches_found">
+        <!-- Case of one match -->
+        <item quantity="one">1 match</item>
+        <!-- Case of multiple total matches -->
+        <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> of <xliff:g id="total" example="137">%d</xliff:g></item>
+    </plurals>
+
+
 </resources>