commit dfe37a409b29bc5aade33a6601d83931aaf9a13c
author Sagar Dhawan <sdhawan@codeaurora.org> Fri Aug 14 12:22:11 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:48 2015 +0200
tree 9cfea6fb0f4aeee6ffd0f24cff880cd6804f3ef7
parent ca9ecfbb05d61a72bad739a24dae771b1bbaa683

Revert "Fixed search engine name shown in browser settings"

This reverts commit 31c461582b6c109b9321f283e7b233399dcb9e79.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 17a98ac..af2fbfa 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -40,6 +40,9 @@
 import android.view.Window;
 
 import org.chromium.base.VisibleForTesting;
+import com.android.browser.R;
+import com.android.browser.search.DefaultSearchEngine;
+import com.android.browser.search.SearchEngine;
 import com.android.browser.stub.NullController;
 
 import java.util.Locale;
@@ -105,6 +108,17 @@
             bar.hide();
         }
 
+        // If this was a web search request, pass it on to the default web
+        // search provider and finish this activity.
+        /*
+        SearchEngine searchEngine = BrowserSettings.getInstance().getSearchEngine();
+        boolean result = IntentHandler.handleWebSearchIntent(this, null, getIntent());
+        if (result && (searchEngine instanceof DefaultSearchEngine)) {
+            finish();
+            return;
+        }
+        */
+
         mActivityScheduler = EngineInitializer.onActivityCreate(BrowserActivity.this);
 
         Thread.setDefaultUncaughtExceptionHandler(new CrashLogExceptionHandler(this));