summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserActivity.java
diff options
context:
space:
mode:
authorSagar Dhawan <sdhawan@codeaurora.org>2015-08-14 12:22:11 -0700
committerjrizzoli <joey@cyanogenmoditalia.it>2015-08-28 13:15:48 +0200
commitdfe37a409b29bc5aade33a6601d83931aaf9a13c (patch)
tree9cfea6fb0f4aeee6ffd0f24cff880cd6804f3ef7 /src/com/android/browser/BrowserActivity.java
parentca9ecfbb05d61a72bad739a24dae771b1bbaa683 (diff)
downloadandroid_packages_apps_Gello-dfe37a409b29bc5aade33a6601d83931aaf9a13c.tar.gz
android_packages_apps_Gello-dfe37a409b29bc5aade33a6601d83931aaf9a13c.tar.bz2
android_packages_apps_Gello-dfe37a409b29bc5aade33a6601d83931aaf9a13c.zip
Revert "Fixed search engine name shown in browser settings"
This reverts commit 31c461582b6c109b9321f283e7b233399dcb9e79.
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
-rw-r--r--src/com/android/browser/BrowserActivity.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 17a98acd..af2fbfa0 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -40,6 +40,9 @@ import android.view.ViewGroup;
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 @@ public class BrowserActivity extends Activity {
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));