diff options
author | Narayan Kamath <narayan@google.com> | 2011-02-23 15:49:17 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2011-03-02 22:45:45 +0000 |
commit | 5119edd5744cfc6d3a8ed480a8853586c737bed4 (patch) | |
tree | aa9f3f6382c047a010742324aa307b20b4f7270e /src/com/android/browser/preferences/LabPreferencesFragment.java | |
parent | 80aad8d851601d39f73214c198111ca49e25f654 (diff) | |
download | packages_apps_browser-5119edd5744cfc6d3a8ed480a8853586c737bed4.zip packages_apps_browser-5119edd5744cfc6d3a8ed480a8853586c737bed4.tar.gz packages_apps_browser-5119edd5744cfc6d3a8ed480a8853586c737bed4.tar.bz2 |
Implement the psychic search engine.
(a) Add a new subclass of SearchEngine that receives
suggestions provided by psychic and displays them in the
suggestions dropdown.
(b) Add a Labs setting that can turn this feature on or
off.
Change-Id: Icae05b6b55f489278028e5af560d9b36014a0f59
Diffstat (limited to 'src/com/android/browser/preferences/LabPreferencesFragment.java')
-rw-r--r-- | src/com/android/browser/preferences/LabPreferencesFragment.java | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/src/com/android/browser/preferences/LabPreferencesFragment.java b/src/com/android/browser/preferences/LabPreferencesFragment.java index 8a8546f..a06dc3e 100644 --- a/src/com/android/browser/preferences/LabPreferencesFragment.java +++ b/src/com/android/browser/preferences/LabPreferencesFragment.java @@ -18,33 +18,47 @@ package com.android.browser.preferences; import com.android.browser.BrowserActivity; import com.android.browser.BrowserSettings; -import com.android.browser.Controller; import com.android.browser.R; +import com.android.browser.search.SearchEngine; -import android.content.Context; import android.content.Intent; -import android.os.AsyncTask; import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceActivity.Header; import android.preference.PreferenceFragment; -import android.preference.PreferenceManager.OnActivityResultListener; - -import java.io.IOException; -import java.io.Serializable; public class LabPreferencesFragment extends PreferenceFragment implements OnPreferenceChangeListener { + private BrowserSettings mBrowserSettings; + private Preference useInstantPref; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mBrowserSettings = BrowserSettings.getInstance(); + // Load the XML preferences file addPreferencesFromResource(R.xml.lab_preferences); Preference e = findPreference(BrowserSettings.PREF_QUICK_CONTROLS); e.setOnPreferenceChangeListener(this); + useInstantPref = findPreference(BrowserSettings.PREF_USE_INSTANT); + } + + @Override + public void onResume() { + super.onResume(); + useInstantPref.setEnabled(false); + + // Enable the "use instant" preference only if the selected + // search engine is google. + if (mBrowserSettings.getSearchEngine() != null) { + final String currentName = mBrowserSettings.getSearchEngine().getName(); + if (SearchEngine.GOOGLE.equals(currentName)) { + useInstantPref.setEnabled(true); + } + } } @Override @@ -54,5 +68,4 @@ public class LabPreferencesFragment extends PreferenceFragment getActivity(), BrowserActivity.class)); return true; } - } |