Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android] Use SEARCH_SUGGEST_ENABLED with PrefServiceBridge.

Browse Source 
Chromium change:

https://chromium.googlesource.com/chromium/src/+/97fd6bcffbe752b404b4664f2314f6045095ba69

commit 97fd6bcffbe752b404b4664f2314f6045095ba69
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Oct 23 21:28:19 2019 +0000

    Add isManagedPreference to PrefServiceBridge

    Add a generic isManagedPreference method to PrefServiceBridge, making
    use of the prefs.h enums.

    Migrate Java usages of prefs::kSearchSuggestEnabled to use the generic
    methods as a sample (more to follow).

    Bug: 1016957
This commit is contained in:
Max Karolinskiy
2020-01-29 07:43:56 -05:00
committed by mkarolin
parent 2d0496b30e
commit 3ffd0ad211
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacyPreferences.java
+4 -3
View File
@@ -13,6 +13,7 @@ import android.support.v7.preference.PreferenceFragmentCompat;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
@@ -81,7 +82,7 @@ public class BravePrivacyPreferences extends PrivacyPreferences {
sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean) newValue);
sharedPreferencesEditor.apply();
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
mPrefServiceBridge.setSearchSuggestEnabled((boolean) newValue);
mPrefServiceBridge.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
}
return true;
@@ -95,7 +96,7 @@ public class BravePrivacyPreferences extends PrivacyPreferences {
private void updatePreferences() {
removePreferenceIfPresent(PREF_SYNC_AND_SERVICES_LINK);
mSearchSuggestions.setChecked(mPrefServiceBridge.isSearchSuggestEnabled());
mSearchSuggestions.setChecked(mPrefServiceBridge.getBoolean(Pref.SEARCH_SUGGEST_ENABLED));
mSearchSuggestions.setOrder(findPreference(PREF_CLEAR_BROWSING_DATA).getOrder() + 1);
}
@@ -110,7 +111,7 @@ public class BravePrivacyPreferences extends PrivacyPreferences {
return preference -> {
String key = preference.getKey();
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
return mPrefServiceBridge.isSearchSuggestManaged();
return mPrefServiceBridge.isManagedPreference(Pref.SEARCH_SUGGEST_ENABLED);
}
return false;
};