summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserSettings.java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2011-11-17 14:43:32 +0000
committerNarayan Kamath <narayan@google.com>2011-11-18 11:42:58 +0000
commitf3174a588cdf63ef59055998c23aad4b36b7856e (patch)
tree31875de0a06d8d100a817c90aa3b455d7c025c27 /src/com/android/browser/BrowserSettings.java
parentccd78601a934cf1ffafe5854a1d465c273727f69 (diff)
downloadandroid_packages_apps_Gello-f3174a588cdf63ef59055998c23aad4b36b7856e.tar.gz
android_packages_apps_Gello-f3174a588cdf63ef59055998c23aad4b36b7856e.tar.bz2
android_packages_apps_Gello-f3174a588cdf63ef59055998c23aad4b36b7856e.zip
Remove the psychic labs feature.
Reverts the UrlInputView to a standard autocomplete that causes less trouble for IMEs. bug:5598837 Change-Id: If469d76f4feda88e4a122264a39d317737404578
Diffstat (limited to 'src/com/android/browser/BrowserSettings.java')
-rw-r--r--src/com/android/browser/BrowserSettings.java15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 0b8191ad..23695549 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -146,10 +146,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
if (sInitialized) {
syncSharedSettings();
}
-
- if (mController != null && (mSearchEngine instanceof InstantSearchEngine)) {
- ((InstantSearchEngine) mSearchEngine).setController(mController);
- }
}
public void startManagingSettings(WebSettings settings) {
@@ -355,9 +351,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
if (PREF_SEARCH_ENGINE.equals(key)) {
updateSearchEngine(false);
}
- if (PREF_USE_INSTANT_SEARCH.equals(key)) {
- updateSearchEngine(true);
- }
if (PREF_FULLSCREEN.equals(key)) {
if (mController.getUi() != null) {
mController.getUi().setFullscreen(useFullscreen());
@@ -426,10 +419,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
mSearchEngine.close();
}
mSearchEngine = SearchEngines.get(mContext, searchEngineName);
-
- if (mController != null && (mSearchEngine instanceof InstantSearchEngine)) {
- ((InstantSearchEngine) mSearchEngine).setController(mController);
- }
}
}
@@ -794,10 +783,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
return HomeProvider.MOST_VISITED.equals(getHomePage());
}
- public boolean useInstantSearch() {
- return mPrefs.getBoolean(PREF_USE_INSTANT_SEARCH, false);
- }
-
public boolean useFullscreen() {
return mPrefs.getBoolean(PREF_FULLSCREEN, false);
}