Merge "Do not store the find callback until action mode starts." into honeycomb

This commit is contained in:
Leon Scroggins
2011-01-10 12:41:20 -08:00
committed by Android (Google) Code Review

View File

@@ -2961,12 +2961,12 @@ public class WebView extends AbsoluteLayout
* @return boolean True if the find dialog is shown, false otherwise.
*/
public boolean showFindDialog(String text, boolean showIme) {
mFindCallback = new FindActionModeCallback(mContext);
if (startActionMode(mFindCallback) == null) {
FindActionModeCallback callback = new FindActionModeCallback(mContext);
if (startActionMode(callback) == null) {
// Could not start the action mode, so end Find on page
mFindCallback = null;
return false;
}
mFindCallback = callback;
setFindIsUp(true);
mFindCallback.setWebView(this);
if (showIme) {