diff options
| author | Vivek Sekhar <vsekhar@codeaurora.org> | 2015-10-14 13:24:24 -0700 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-11-05 14:33:37 +0100 |
| commit | 1fdc94edcd49019b80863f4b0bfdf52747ab7f40 (patch) | |
| tree | 2d95fb9646bcb80e50b14abe1d3530018a68a7ea /src/com | |
| parent | b0cd8766eee8e598969cf2b408b2f4f859a592af (diff) | |
| download | android_packages_apps_Gello-1fdc94edcd49019b80863f4b0bfdf52747ab7f40.tar.gz android_packages_apps_Gello-1fdc94edcd49019b80863f4b0bfdf52747ab7f40.tar.bz2 android_packages_apps_Gello-1fdc94edcd49019b80863f4b0bfdf52747ab7f40.zip | |
Fixed default search engine selection in UI
- Ensure the UI show the user/default search engine
CR-Fixed:910238
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/preferences/GeneralPreferencesFragment.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java index 52b91425..df4cf19f 100644 --- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java +++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java @@ -115,7 +115,7 @@ public class GeneralPreferencesFragment extends SWEPreferenceFragment //Disable set search engine preference if SEARCH_ENGINE restriction is enabled if (SearchEngineRestriction.getInstance().isEnabled()) { - findPreference("search_engine").setEnabled(false); + findPreference(PreferenceKeys.PREF_SEARCH_ENGINE).setEnabled(false); } // Register Preference objects with their MDM restriction handlers @@ -123,6 +123,11 @@ public class GeneralPreferencesFragment extends SWEPreferenceFragment registerPreference(findPreference(PreferenceKeys.PREF_AUTOFILL_ENABLED)); mAdvFrag = new AdvancedPreferencesFragment(this); + // reset the search engine based on locale + pref = (ListPreference) findPreference(PreferenceKeys.PREF_SEARCH_ENGINE); + String search_engine = BrowserSettings.getInstance().getUserSearchEngine(); + pref.setValue((String) search_engine); + pref.setSummary(pref.getEntry()); //mPrivFrag = new PrivacySecurityPreferencesFragment(this); } @@ -237,11 +242,6 @@ public class GeneralPreferencesFragment extends SWEPreferenceFragment refreshUi(); } - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - } - void refreshUi() { ActionBar bar = getActivity().getActionBar(); if (bar != null) { |