commit 1fdc94edcd49019b80863f4b0bfdf52747ab7f40
author Vivek Sekhar <vsekhar@codeaurora.org> Wed Oct 14 13:24:24 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Thu Nov 05 14:33:37 2015 +0100
tree 2d95fb9646bcb80e50b14abe1d3530018a68a7ea
parent b0cd8766eee8e598969cf2b408b2f4f859a592af

Fixed default search engine selection in UI

- Ensure the UI show the user/default search engine

CR-Fixed:910238

src/com/android/browser/preferences/GeneralPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index 52b9142..df4cf19 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -115,7 +115,7 @@
 
         //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 @@
                 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 @@
         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) {