commit 70c7844ff0156926dfa58896c911de71982bd638
author Selim Gurun <sgurun@google.com> Tue Sep 11 12:01:50 2012 -0700
committer Selim Gurun <sgurun@google.com> Tue Sep 11 13:51:24 2012 -0700
tree d512ca9985dd5ad683da12e1e9b5841fc5ac1f26
parent 34c8499cc0fadea73233b0bd8e33f26811972ad1

Deleted code that relies on defunct SearchBox interface.

Change-Id: I831890524acb4e38078053d504c3ada468eca686

src/com/android/browser/PreloadedTabControl.java

diff --git a/src/com/android/browser/PreloadedTabControl.java b/src/com/android/browser/PreloadedTabControl.java
index 0b2956f..21dafa9 100644
--- a/src/com/android/browser/PreloadedTabControl.java
+++ b/src/com/android/browser/PreloadedTabControl.java
@@ -18,7 +18,6 @@
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.SearchBox;
 
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -39,83 +38,16 @@
         mTab = t;
     }
 
-    private void maybeSetQuery(final String query, SearchBox sb) {
-        if (!TextUtils.equals(mLastQuery, query)) {
-            if (sb != null) {
-                if (LOGD_ENABLED) Log.d(LOGTAG, "Changing searchbox query to " + query);
-                sb.setVerbatim(true);
-                sb.setQuery(query);
-                sb.onchange(new SearchBox.SearchBoxListener() {
-                    @Override
-                    public void onChangeComplete(boolean called) {
-                        if (mDestroyed) return;
-                        if (LOGD_ENABLED) Log.d(LOGTAG, "Changed searchbox query: " + called);
-                        if (called) {
-                            mLastQuery = query;
-                        }
-                    }
-                });
-            } else {
-                if (LOGD_ENABLED) Log.d(LOGTAG, "Cannot set query: no searchbox interface");
-            }
-        }
-    }
-
     public void setQuery(String query) {
-        maybeSetQuery(query, mTab.getWebViewClassic().getSearchBox());
+        if (LOGD_ENABLED) Log.d(LOGTAG, "Cannot set query: no searchbox interface");
     }
 
     public boolean searchBoxSubmit(final String query,
             final String fallbackUrl, final Map<String, String> fallbackHeaders) {
-        final SearchBox sb = mTab.getWebViewClassic().getSearchBox();
-        if (sb == null) {
-            // no searchbox, cannot submit. Fallback to regular tab creation
-            if (LOGD_ENABLED) Log.d(LOGTAG, "No searchbox, cannot submit query");
-            return false;
-        }
-        maybeSetQuery(query, sb);
-        if (LOGD_ENABLED) Log.d(LOGTAG, "Submitting query " + query);
-        final String currentUrl = mTab.getUrl();
-        sb.onsubmit(new SearchBox.SearchBoxListener() {
-            @Override
-            public void onSubmitComplete(boolean called) {
-                if (mDestroyed) return;
-                if (LOGD_ENABLED) Log.d(LOGTAG, "Query submitted: " + called);
-                if (!called) {
-                    if (LOGD_ENABLED) Log.d(LOGTAG, "Query not submitted; falling back");
-                    loadUrl(fallbackUrl, fallbackHeaders);
-                    // make sure that the failed, preloaded URL is cleared from the back stack
-                    mTab.clearBackStackWhenItemAdded(Pattern.compile(
-                            "^" + Pattern.quote(fallbackUrl) + "$"));
-                } else {
-                    // ignore the next fragment change, to avoid leaving a blank page in the browser
-                    // after the query has been submitted.
-                    String currentWithoutFragment = Uri.parse(currentUrl)
-                            .buildUpon()
-                            .fragment(null)
-                            .toString();
-                    mTab.clearBackStackWhenItemAdded(
-                            Pattern.compile(
-                                    "^" +
-                                    Pattern.quote(currentWithoutFragment) +
-                                    "(\\#.*)?" +
-                                    "$"));
-                }
-            }});
-        return true;
+        return false;
     }
 
     public void searchBoxCancel() {
-        SearchBox sb = mTab.getWebViewClassic().getSearchBox();
-        if (sb != null) {
-            mLastQuery = null;
-            sb.oncancel(new SearchBox.SearchBoxListener(){
-                @Override
-                public void onCancelComplete(boolean called) {
-                    if (LOGD_ENABLED) Log.d(LOGTAG, "Query cancelled: " + called);
-                }
-            });
-        }
     }
 
     public void loadUrlIfChanged(String url, Map<String, String> headers) {