Rename PreferenceUtils to SettingsUtils

This is a purely mechanical rename done with Android Studio.

This class is being renamed to adhere to the conventions described in
go/clank-preferences-refactor.

TBR=gogerald@chromium.org

Bug: 1029146
Change-Id: I642f4c0236ac1c034eb62f3ab62ce63a711967ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947394
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721107}

chrome/android/chrome_java_sources.gni

@@ -1337,13 +1337,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/ManagedPreferenceDelegate.java",
   "java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtils.java",
   "java/src/org/chromium/chrome/browser/settings/NotificationsPreferences.java",
-  "java/src/org/chromium/chrome/browser/settings/PreferenceUtils.java",
   "java/src/org/chromium/chrome/browser/settings/PreferencesLauncher.java",
   "java/src/org/chromium/chrome/browser/settings/SearchEngineAdapter.java",
   "java/src/org/chromium/chrome/browser/settings/SearchEnginePreference.java",
   "java/src/org/chromium/chrome/browser/settings/SearchUtils.java",
   "java/src/org/chromium/chrome/browser/settings/SeekBarPreference.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
+  "java/src/org/chromium/chrome/browser/settings/SettingsUtils.java",
   "java/src/org/chromium/chrome/browser/settings/SpinnerPreference.java",
   "java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java",
   "java/src/org/chromium/chrome/browser/settings/sync/ManageSyncPreferences.java",

chrome/android/java/src/org/chromium/chrome/browser/settings/AccessibilityPreferences.java

@@ -53,7 +53,7 @@ public class AccessibilityPreferences
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         getActivity().setTitle(R.string.prefs_accessibility);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.accessibility_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.accessibility_preferences);
 
         mFormat = NumberFormat.getPercentInstance();
         mFontSizePrefs = FontSizePrefs.getInstance();

chrome/android/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreference.java

@@ -81,7 +81,7 @@ public class ChromeImageViewPreference extends Preference {
         View view = holder.itemView;
 
         if (mImageRes != 0) {
-            Drawable buttonImg = PreferenceUtils.getTintedIcon(getContext(), mImageRes);
+            Drawable buttonImg = SettingsUtils.getTintedIcon(getContext(), mImageRes);
 
             button.setImageDrawable(buttonImg);
             button.setBackgroundColor(Color.TRANSPARENT);

chrome/android/java/src/org/chromium/chrome/browser/settings/HomepageEditor.java

@@ -36,7 +36,7 @@ public class HomepageEditor extends Fragment implements TextWatcher {
         View v = inflater.inflate(R.layout.homepage_editor, container, false);
         View scrollView = v.findViewById(R.id.scroll_view);
         scrollView.getViewTreeObserver().addOnScrollChangedListener(
-                PreferenceUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
+                SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
         mHomepageUrlEdit = (EditText) v.findViewById(R.id.homepage_url_edit);
         mHomepageUrlEdit.setText(HomepageManager.getHomepageUri());
         mHomepageUrlEdit.addTextChangedListener(this);

chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java

@@ -30,7 +30,7 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
         mHomepageManager = HomepageManager.getInstance();
 
         getActivity().setTitle(R.string.options_homepage_title);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.homepage_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.homepage_preferences);
 
         ChromeSwitchPreference homepageSwitch =
                 (ChromeSwitchPreference) findPreference(PREF_HOMEPAGE_SWITCH);

chrome/android/java/src/org/chromium/chrome/browser/settings/MainPreferences.java

@@ -127,7 +127,7 @@ public class MainPreferences extends PreferenceFragmentCompat
     }
 
     private void createPreferences() {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.main_preferences);
         cachePreferences();
 
         mSignInPreference.setOnStateChangedCallback(this::onSignInPreferenceStateChanged);

chrome/android/java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtils.java

@@ -88,10 +88,10 @@ public class ManagedPreferencesUtils {
         if (delegate == null) return preference.getIcon();
 
         if (delegate.isPreferenceControlledByPolicy(preference)) {
-            return PreferenceUtils.getTintedIcon(
+            return SettingsUtils.getTintedIcon(
                     preference.getContext(), getManagedByEnterpriseIconId());
         } else if (delegate.isPreferenceControlledByCustodian(preference)) {
-            return PreferenceUtils.getTintedIcon(
+            return SettingsUtils.getTintedIcon(
                     preference.getContext(), getManagedByCustodianIconId());
         }
 

chrome/android/java/src/org/chromium/chrome/browser/settings/NotificationsPreferences.java

@@ -42,7 +42,7 @@ public class NotificationsPreferences extends PreferenceFragmentCompat {
         assert Build.VERSION.SDK_INT < Build.VERSION_CODES.O
             : "NotificationsPreferences should only be used pre-O.";
 
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.notifications_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.notifications_preferences);
         getActivity().setTitle(R.string.prefs_notifications);
 
         mSuggestionsPref = (ChromeSwitchPreference) findPreference(PREF_SUGGESTIONS);

chrome/android/java/src/org/chromium/chrome/browser/settings/SearchUtils.java

@@ -131,7 +131,7 @@ public class SearchUtils {
         ImageView clearButton = findSearchClearButton(searchView);
         clearButton.setVisibility(query == null || query.equals("") ? View.GONE : View.VISIBLE);
         if (activity != null) {
-            PreferenceUtils.setOverflowMenuVisibility(
+            SettingsUtils.setOverflowMenuVisibility(
                     activity, query != null ? View.GONE : View.VISIBLE);
         }
     }

chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java

@@ -50,7 +50,7 @@ import org.chromium.ui.UiUtils;
  * HomepageEditor}) or overrides {@link PreferenceFragmentCompat}'s layout, add the following:
  * 1) preferences_action_bar_shadow.xml to the custom XML hierarchy and
  * 2) an OnScrollChangedListener to the main content's view's view tree observer via
- *    PreferenceUtils.getShowShadowOnScrollListener(...).
+ *    {@link SettingsUtils#getShowShadowOnScrollListener(View, View)}.
  */
 public class SettingsActivity extends ChromeBaseAppCompatActivity
         implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
@@ -171,7 +171,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
 
         // Display shadow on scroll.
         recyclerView.getViewTreeObserver().addOnScrollChangedListener(
-                PreferenceUtils.getShowShadowOnScrollListener(
+                SettingsUtils.getShowShadowOnScrollListener(
                         recyclerView, inflatedView.findViewById(R.id.shadow)));
     }
 

chrome/android/java/src/org/chromium/chrome/browser/settings/PreferenceUtils.java → chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsUtils.java

@@ -25,9 +25,9 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 
 /**
- * A helper class for Preferences.
+ * A helper class for Settings.
  */
-public class PreferenceUtils {
+public class SettingsUtils {
     /**
      * A helper that is used to load preferences from XML resources without causing a
      * StrictModeViolation. See http://crbug.com/692125.

chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromePreferences.java

@@ -14,7 +14,7 @@ import android.text.format.DateUtils;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeVersionInfo;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.developer.DeveloperPreferences;
 import org.chromium.ui.widget.Toast;
 
@@ -48,7 +48,7 @@ public class AboutChromePreferences
     @Override
     public void onCreatePreferences(Bundle bundle, String s) {
         getActivity().setTitle(R.string.prefs_about_chrome);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.about_chrome_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.about_chrome_preferences);
 
         Preference p = findPreference(PREF_APPLICATION_VERSION);
         p.setSummary(

chrome/android/java/src/org/chromium/chrome/browser/settings/about/LegalInformationPreferences.java

@@ -8,7 +8,7 @@ import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 /**
  * Fragment to display legal information about Chrome.
@@ -16,7 +16,7 @@ import org.chromium.chrome.browser.settings.PreferenceUtils;
 public class LegalInformationPreferences extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String s) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.legal_information_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.legal_information_preferences);
         getActivity().setTitle(R.string.legal_information_title);
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillEditorBase.java

@@ -27,7 +27,7 @@ import android.widget.Spinner;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.settings.MainPreferences;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.ui.widget.FadingEdgeScrollView;
 import org.chromium.chrome.browser.widget.prefeditor.EditorDialog;
 
@@ -73,7 +73,7 @@ public abstract class AutofillEditorBase
         scrollView.setEdgeVisibility(
                 FadingEdgeScrollView.EdgeType.NONE, FadingEdgeScrollView.EdgeType.FADING);
         scrollView.getViewTreeObserver().addOnScrollChangedListener(
-                PreferenceUtils.getShowShadowOnScrollListener(
+                SettingsUtils.getShowShadowOnScrollListener(
                         scrollView, baseView.findViewById(R.id.shadow)));
         // Inflate the editor and buttons into the "content" LinearLayout.
         LinearLayout contentLayout = (LinearLayout) scrollView.findViewById(R.id.content);

chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfilePreferences.java

@@ -15,7 +15,7 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.settings.MainPreferences;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 /**
  * Fragment for settings page that allows user to view and edit a single server-provided address.
@@ -29,7 +29,7 @@ public class AutofillServerProfilePreferences
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.autofill_server_profile_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.autofill_server_profile_preferences);
         getActivity().setTitle(R.string.autofill_edit_profile);
 
         // We know which card to display based on the GUID stuffed in

chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java

@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings.ContentLengths;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.util.IntentUtils;
 
@@ -48,7 +48,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
         getActivity().setTitle(R.string.data_reduction_title_lite_mode);
         boolean isEnabled = DataReductionProxySettings.getInstance().isDataReductionProxyEnabled();
         mIsEnabled = !isEnabled;
@@ -136,9 +136,9 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
         getPreferenceScreen().removeAll();
         createDataReductionSwitch(isEnabled);
         if (isEnabled) {
-            PreferenceUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
+            SettingsUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
         } else {
-            PreferenceUtils.addPreferencesFromResource(
+            SettingsUtils.addPreferencesFromResource(
                     this, R.xml.data_reduction_preferences_off_lite_mode);
         }
         mIsEnabled = isEnabled;

chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperPreferences.java

@@ -10,7 +10,7 @@ import android.support.v7.preference.PreferenceFragmentCompat;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeVersionInfo;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.components.version_info.Channel;
 import org.chromium.components.version_info.VersionConstants;
 
@@ -41,7 +41,7 @@ public class DeveloperPreferences extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String s) {
         getActivity().setTitle(MSG_DEVELOPER_OPTIONS_TITLE);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.developer_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.developer_preferences);
 
         if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) {
             getPreferenceScreen().removePreference(findPreference(UI_PREF_BETA_STABLE_HINT));

chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingPreferences.java

@@ -14,7 +14,7 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.tracing.TracingController;
 import org.chromium.chrome.browser.tracing.TracingNotificationManager;
 
@@ -181,7 +181,7 @@ public class TracingPreferences
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         getActivity().setTitle(MSG_TRACING_TITLE);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.tracing_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.tracing_preferences);
 
         mPrefDefaultCategories = findPreference(UI_PREF_DEFAULT_CATEGORIES);
         mPrefNondefaultCategories = findPreference(UI_PREF_NON_DEFAULT_CATEGORIES);

chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadPreferences.java

@@ -15,7 +15,7 @@ import org.chromium.chrome.browser.download.DownloadPromptStatus;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchConfiguration;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 /**
  * Fragment to keep track of all downloads related preferences.
@@ -33,7 +33,7 @@ public class DownloadPreferences
     @Override
     public void onCreatePreferences(@Nullable Bundle savedInstanceState, String s) {
         getActivity().setTitle(R.string.menu_downloads);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.download_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.download_preferences);
 
         mLocationPromptEnabledPref =
                 (ChromeSwitchPreference) findPreference(PREF_LOCATION_PROMPT_ENABLED);

chrome/android/java/src/org/chromium/chrome/browser/settings/languages/AddLanguageFragment.java

@@ -23,7 +23,7 @@ import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -128,7 +128,7 @@ public class AddLanguageFragment extends Fragment {
         mRecyclerView.setAdapter(mAdapter);
         mAdapter.setDisplayedLanguages(mFullLanguageList);
         mRecyclerView.getViewTreeObserver().addOnScrollChangedListener(
-                PreferenceUtils.getShowShadowOnScrollListener(
+                SettingsUtils.getShowShadowOnScrollListener(
                         mRecyclerView, view.findViewById(R.id.shadow)));
         return view;
     }

chrome/android/java/src/org/chromium/chrome/browser/settings/languages/LanguagesPreferences.java

@@ -14,8 +14,8 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
 import org.chromium.chrome.browser.settings.PreferencesLauncher;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 /**
  * Settings fragment that displays information about Chrome languages, which allow users to
@@ -32,7 +32,7 @@ public class LanguagesPreferences
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         getActivity().setTitle(R.string.prefs_languages);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.languages_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.languages_preferences);
 
         LanguageListPreference mLanguageListPref =
                 (LanguageListPreference) findPreference(PREFERRED_LANGUAGES_KEY);

chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordEntryViewer.java

@@ -37,7 +37,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.components.sync.AndroidSyncSettings;
 import org.chromium.ui.text.SpanApplier;
@@ -127,7 +127,7 @@ public class PasswordEntryViewer
                 Context.CLIPBOARD_SERVICE);
         setRowText(R.id.url_row, url);
         mView.getViewTreeObserver().addOnScrollChangedListener(
-                PreferenceUtils.getShowShadowOnScrollListener(
+                SettingsUtils.getShowShadowOnScrollListener(
                         mView, inflatedView.findViewById(R.id.shadow)));
 
         hookupCopySiteButton(mView.findViewById(R.id.url_row));

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataPreferences.java

@@ -37,7 +37,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.SpinnerPreference;
 import org.chromium.chrome.browser.settings.privacy.BrowsingDataCounterBridge.BrowsingDataCounterCallback;
 import org.chromium.ui.widget.ButtonCompat;
@@ -83,7 +83,7 @@ public abstract class ClearBrowsingDataPreferences extends PreferenceFragmentCom
 
             int dp = mParent.getResources().getConfiguration().smallestScreenWidthDp;
             if (dp >= MIN_DP_FOR_ICON) {
-                mCheckbox.setIcon(PreferenceUtils.getTintedIcon(
+                mCheckbox.setIcon(SettingsUtils.getTintedIcon(
                         context, ClearBrowsingDataPreferences.getIcon(option)));
             }
         }
@@ -529,7 +529,7 @@ public abstract class ClearBrowsingDataPreferences extends PreferenceFragmentCom
         }
         mDialogOpened = SystemClock.elapsedRealtime();
         getActivity().setTitle(R.string.clear_browsing_data_title);
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.clear_browsing_data_preferences_tab);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.clear_browsing_data_preferences_tab);
         List<Integer> options = getDialogOptions();
         mItems = new Item[options.size()];
         for (int i = 0; i < options.size(); i++) {

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java

@@ -11,7 +11,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchUma;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 /**
  * Fragment to manage the Contextual Search preference and to explain to the user what it does.
@@ -21,7 +21,7 @@ public class ContextualSearchPreferenceFragment extends PreferenceFragmentCompat
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.contextual_search_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.contextual_search_preferences);
         getActivity().setTitle(R.string.contextual_search_title);
         setHasOptionsMenu(true);
         initContextualSearchSwitch();

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/DoNotTrackPreference.java

@@ -11,7 +11,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 /**
  * Fragment to manage 'Do Not Track' preference and to explain to the user what it does.
@@ -22,7 +22,7 @@ public class DoNotTrackPreference extends PreferenceFragmentCompat {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.do_not_track_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.do_not_track_preferences);
         getActivity().setTitle(R.string.do_not_track_title);
 
         ChromeSwitchPreference doNotTrackSwitch =

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java

@@ -21,8 +21,8 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
 import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
 import org.chromium.chrome.browser.settings.PreferencesLauncher;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.sync.SyncAndServicesPreferences;
 import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
@@ -45,7 +45,7 @@ public class PrivacyPreferences
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
         privacyPrefManager.migrateNetworkPredictionPreferences();
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
         getActivity().setTitle(R.string.prefs_privacy);
         setHasOptionsMenu(true);
 

chrome/android/java/src/org/chromium/chrome/browser/settings/sync/ManageSyncPreferences.java

@@ -31,7 +31,7 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.ui.PassphraseCreationDialogFragment;
 import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
@@ -106,7 +106,7 @@ public class ManageSyncPreferences extends PreferenceFragmentCompat
         getActivity().setTitle(R.string.manage_sync_title);
         setHasOptionsMenu(true);
 
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.manage_sync_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.manage_sync_preferences);
 
         mSyncEverything = (ChromeSwitchPreference) findPreference(PREF_SYNC_EVERYTHING);
         mSyncEverything.setOnPreferenceChangeListener(this);

chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesPreferences.java

@@ -50,8 +50,8 @@ import org.chromium.chrome.browser.settings.ChromeBasePreference;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
 import org.chromium.chrome.browser.settings.ManagedPreferencesUtils;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
 import org.chromium.chrome.browser.settings.SettingsActivity;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.password.PasswordUIView;
 import org.chromium.chrome.browser.settings.privacy.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
@@ -182,7 +182,7 @@ public class SyncAndServicesPreferences extends PreferenceFragmentCompat
             RecordUserAction.record("Signin_Signin_ShowAdvancedSyncSettings");
         }
 
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.sync_and_services_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.sync_and_services_preferences);
 
         mSigninPreference = (SignInPreference) findPreference(PREF_SIGNIN);
         mSigninPreference.setPersonalizedPromoEnabled(false);

chrome/android/java/src/org/chromium/chrome/browser/settings/themes/ThemePreferences.java

@@ -18,7 +18,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.night_mode.NightModeUtils;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.ui.UiUtils;
 
 import java.lang.annotation.Retention;
@@ -47,7 +47,7 @@ public class ThemePreferences extends PreferenceFragmentCompat {
 
     @Override
     public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.theme_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.theme_preferences);
         getActivity().setTitle(R.string.prefs_themes);
 
         SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getInstance();

chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java

@@ -51,8 +51,8 @@ import org.chromium.chrome.browser.settings.ExpandablePreferenceGroup;
 import org.chromium.chrome.browser.settings.LocationSettings;
 import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
 import org.chromium.chrome.browser.settings.ManagedPreferencesUtils;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
 import org.chromium.chrome.browser.settings.SearchUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.website.Website.StoredDataClearedCallback;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.ui.widget.Toast;
@@ -350,7 +350,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.website_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.website_preferences);
 
         String title = getArguments().getString(EXTRA_TITLE);
         if (title != null) getActivity().setTitle(title);
@@ -612,7 +612,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
         // This will remove the combo box at the top and all the sites listed below it.
         getPreferenceScreen().removeAll();
         // And this will add the filter preference back (combo box).
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.website_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.website_preferences);
 
         configureGlobalToggles();
 

chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java

@@ -33,7 +33,7 @@ import org.chromium.chrome.browser.notifications.channels.SiteChannelsManager;
 import org.chromium.chrome.browser.settings.ChromeImageViewPreference;
 import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
 import org.chromium.chrome.browser.settings.ManagedPreferencesUtils;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -293,7 +293,7 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat
      * Must only be called once mSite is set.
      */
     private void displaySitePermissions() {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.single_website_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.single_website_preferences);
 
         Set<String> permissionPreferenceKeys =
                 new HashSet<>(Arrays.asList(PERMISSION_PREFERENCE_KEYS));
@@ -737,7 +737,7 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat
             preference.setIcon(category.getDisabledInAndroidIcon(getActivity()));
             preference.setEnabled(false);
         } else {
-            preference.setIcon(PreferenceUtils.getTintedIcon(
+            preference.setIcon(SettingsUtils.getTintedIcon(
                     getActivity(), ContentSettingsResources.getIcon(contentType)));
         }
     }

chrome/android/java/src/org/chromium/chrome/browser/settings/website/SiteSettingsPreferences.java

@@ -13,7 +13,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.LocationSettings;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.website.SiteSettingsCategory.Type;
 import org.chromium.content_public.browser.ContentFeatureList;
 import org.chromium.content_public.common.ContentSwitches;
@@ -34,7 +34,7 @@ public class SiteSettingsPreferences
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        PreferenceUtils.addPreferencesFromResource(this, R.xml.site_settings_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.site_settings_preferences);
         getActivity().setTitle(R.string.prefs_site_settings);
 
         configurePreferences();
@@ -142,7 +142,7 @@ public class SiteSettingsPreferences
             }
 
             if (p.isEnabled()) {
-                p.setIcon(PreferenceUtils.getTintedIcon(
+                p.setIcon(SettingsUtils.getTintedIcon(
                         getActivity(), ContentSettingsResources.getIcon(contentType)));
             } else {
                 p.setIcon(ContentSettingsResources.getDisabledIcon(contentType, getResources()));

chrome/android/java/src/org/chromium/chrome/browser/widget/prefeditor/EditorDialog.java

@@ -44,7 +44,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.settings.PreferenceUtils;
+import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.autofill.CreditCardNumberFormattingTextWatcher;
 import org.chromium.chrome.browser.ui.widget.AlwaysDismissedDialog;
 import org.chromium.chrome.browser.ui.widget.FadingEdgeScrollView;
@@ -231,7 +231,7 @@ public class EditorDialog
         params.topMargin = toolbar.getLayoutParams().height;
         shadow.setLayoutParams(params);
         scrollView.getViewTreeObserver().addOnScrollChangedListener(
-                PreferenceUtils.getShowShadowOnScrollListener(scrollView, shadow));
+                SettingsUtils.getShowShadowOnScrollListener(scrollView, shadow));
     }
 
     /**