[Android] Rename Main settings fragment

Following the naming conventions decided in
go/clank-preferences-refactor, this change replaces the "Preferences"
suffix with "Settings".

Bug: 1030446
Change-Id: Icc4f86b119194cc92716b5452711ea8dfafd8883
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014623Reviewed-by: Gang Wu <gangwu@chromium.org>
Reviewed-by: Sky Malice <skym@chromium.org>
Reviewed-by: Ganggui Tang <gogerald@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735132}

chrome/android/chrome_java_sources.gni

@@ -1366,7 +1366,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java",
   "java/src/org/chromium/chrome/browser/settings/LearnMorePreference.java",
   "java/src/org/chromium/chrome/browser/settings/LocationSettings.java",
-  "java/src/org/chromium/chrome/browser/settings/MainPreferences.java",
+  "java/src/org/chromium/chrome/browser/settings/MainSettings.java",
   "java/src/org/chromium/chrome/browser/settings/NfcSystemLevelSetting.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsLauncher.java",

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

@@ -42,7 +42,7 @@ import java.util.Map;
 /**
  * The main settings screen, shown when the user first opens Settings.
  */
-public class MainPreferences extends PreferenceFragmentCompat
+public class MainSettings extends PreferenceFragmentCompat
         implements TemplateUrlService.LoadListener, ProfileSyncService.SyncStateChangedListener,
                    SigninManager.SignInStateObserver {
     public static final String PREF_ACCOUNT_SECTION = "account_section";
@@ -62,7 +62,7 @@ public class MainPreferences extends PreferenceFragmentCompat
     private final Map<String, Preference> mAllPreferences = new HashMap<>();
     private SignInPreference mSignInPreference;
 
-    public MainPreferences() {
+    public MainSettings() {
         setHasOptionsMenu(true);
         mManagedPreferenceDelegate = createManagedPreferenceDelegate();
     }

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

@@ -102,7 +102,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
         // If savedInstanceState is non-null, then the activity is being
         // recreated and super.onCreate() has already recreated the fragment.
         if (savedInstanceState == null) {
-            if (initialFragment == null) initialFragment = MainPreferences.class.getName();
+            if (initialFragment == null) initialFragment = MainSettings.class.getName();
 
             Fragment fragment = Fragment.instantiate(this, initialFragment, initialArguments);
             getSupportFragmentManager()

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

@@ -44,7 +44,7 @@ public class AutofillProfileEditorPreference extends Preference {
     protected void onClick() {
         Bundle extras = getExtras();
         // We know which profile to edit based on the GUID stuffed in our extras
-        // by MainPreferences.
+        // by MainSettings.
         mGUID = extras.getString(AutofillEditorBase.AUTOFILL_GUID);
         prepareEditorDialog();
         prepareAddressEditor();

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

@@ -32,7 +32,7 @@ public class AutofillServerProfileFragment
         getActivity().setTitle(R.string.autofill_edit_profile);
 
         // We know which card to display based on the GUID stuffed in
-        // our extras by MainPreferences.
+        // our extras by MainSettings.
         Bundle extras = getArguments();
         if (extras != null) {
             mGUID = extras.getString(AutofillEditorBase.AUTOFILL_GUID);

chrome/android/javatests/src/org/chromium/chrome/browser/settings/PasswordViewingTypeTest.java

@@ -45,7 +45,7 @@ public class PasswordViewingTypeTest {
     @Rule
     public AccountManagerTestRule mAccountManagerTestRule = new AccountManagerTestRule();
 
-    private MainPreferences mMainPreferences;
+    private MainSettings mMainSettings;
     private ChromeBasePreference mPasswordsPref;
     private Context mContext;
     private MockSyncContentResolverDelegate mSyncContentResolverDelegate;
@@ -57,11 +57,11 @@ public class PasswordViewingTypeTest {
         setupTestAccount();
         mSyncContentResolverDelegate = new MockSyncContentResolverDelegate();
         mContext = InstrumentationRegistry.getTargetContext();
-        mMainPreferences = (MainPreferences) startMainPreferences(
+        mMainSettings = (MainSettings) startMainSettings(
                 InstrumentationRegistry.getInstrumentation(), mContext)
                                 .getMainFragment();
-        mPasswordsPref = (ChromeBasePreference) mMainPreferences.findPreference(
-                MainPreferences.PREF_SAVED_PASSWORDS);
+        mPasswordsPref = (ChromeBasePreference) mMainSettings.findPreference(
+                MainSettings.PREF_SAVED_PASSWORDS);
         AndroidSyncSettings.overrideForTests(mSyncContentResolverDelegate, null);
         mAuthority = AndroidSyncSettings.get().getContractAuthority();
         AndroidSyncSettings.get().updateAccount(mAccount);
@@ -80,13 +80,13 @@ public class PasswordViewingTypeTest {
     }
 
     /**
-     * Launches the main preferences.
+     * Launches the main settings.
      */
-    private static SettingsActivity startMainPreferences(
+    private static SettingsActivity startMainSettings(
             Instrumentation instrumentation, final Context mContext) {
         Intent intent = SettingsLauncher.getInstance().createIntentForSettingsPage(
-                mContext, MainPreferences.class.getName());
-        Activity activity = (SettingsActivity) instrumentation.startActivitySync(intent);
+                mContext, MainSettings.class.getName());
+        Activity activity = instrumentation.startActivitySync(intent);
         return (SettingsActivity) activity;
     }
 
@@ -159,7 +159,7 @@ public class PasswordViewingTypeTest {
         overrideProfileSyncService(true);
         Assert.assertEquals(
                 SavePasswordsPreferences.class.getCanonicalName(), mPasswordsPref.getFragment());
-        Assert.assertNotNull(mMainPreferences.getActivity().getIntent());
+        Assert.assertNotNull(mMainSettings.getActivity().getIntent());
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/settings/SettingsActivityTest.java

@@ -66,7 +66,7 @@ public class SettingsActivityTest {
         });
 
         SettingsActivityTest.startSettingsActivity(
-                InstrumentationRegistry.getInstrumentation(), MainPreferences.class.getName());
+                InstrumentationRegistry.getInstrumentation(), MainSettings.class.getName());
 
         onView(withText(R.string.prefs_saved_passwords_title)).perform(click());
         onView(withText(R.string.prefs_saved_passwords)).check(matches(isDisplayed()));

chrome/android/javatests/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineSettingsTest.java

@@ -21,7 +21,7 @@ import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-import org.chromium.chrome.browser.settings.MainPreferences;
+import org.chromium.chrome.browser.settings.MainSettings;
 import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
 import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsActivityTest;
@@ -143,11 +143,11 @@ public class SearchEngineSettingsTest {
         SettingsActivity settingsActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SettingsActivity.class);
 
-        final MainPreferences mainPreferences =
-                ActivityUtils.waitForFragmentToAttach(settingsActivity, MainPreferences.class);
+        final MainSettings mainSettings =
+                ActivityUtils.waitForFragmentToAttach(settingsActivity, MainSettings.class);
 
         final Preference searchEnginePref =
-                waitForPreference(mainPreferences, MainPreferences.PREF_SEARCH_ENGINE);
+                waitForPreference(mainSettings, MainSettings.PREF_SEARCH_ENGINE);
 
         CriteriaHelper.pollUiThread(Criteria.equals(null, new Callable<Object>() {
             @Override
@@ -157,7 +157,7 @@ public class SearchEngineSettingsTest {
         }));
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             ManagedPreferenceDelegate managedPrefDelegate =
-                    mainPreferences.getManagedPreferenceDelegateForTest();
+                    mainSettings.getManagedPreferenceDelegateForTest();
             Assert.assertTrue(managedPrefDelegate.isPreferenceControlledByPolicy(searchEnginePref));
         });
     }

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java

@@ -38,7 +38,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.settings.MainPreferences;
+import org.chromium.chrome.browser.settings.MainSettings;
 import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.sync.AccountManagementFragment;
 import org.chromium.chrome.browser.settings.sync.SignInPreference;
@@ -279,8 +279,8 @@ public class SigninTest {
 
         // Verify that its preference UI is enabled.
         SettingsActivity settingsActivity = mActivityTestRule.startSettingsActivity(null);
-        MainPreferences mainPrefs = getMainPreferences(settingsActivity);
-        Preference passwordPref = mainPrefs.findPreference(MainPreferences.PREF_SAVED_PASSWORDS);
+        MainSettings mainPrefs = getMainSettings(settingsActivity);
+        Preference passwordPref = mainPrefs.findPreference(MainSettings.PREF_SAVED_PASSWORDS);
         Assert.assertNotNull(passwordPref);
         // This preference opens a new fragment when clicked.
         Assert.assertNotNull(passwordPref.getFragment());
@@ -353,16 +353,16 @@ public class SigninTest {
         InstrumentationRegistry.getInstrumentation().waitForIdleSync();
     }
 
-    private static MainPreferences getMainPreferences(SettingsActivity settingsActivity) {
+    private static MainSettings getMainSettings(SettingsActivity settingsActivity) {
         Fragment fragment = settingsActivity.getMainFragment();
         Assert.assertNotNull(fragment);
-        Assert.assertTrue(fragment instanceof MainPreferences);
-        return (MainPreferences) fragment;
+        Assert.assertTrue(fragment instanceof MainSettings);
+        return (MainSettings) fragment;
     }
 
     private static void clickSigninPreference(SettingsActivity settingsActivity) {
-        MainPreferences mainPrefs = getMainPreferences(settingsActivity);
-        Preference signinPref = mainPrefs.findPreference(MainPreferences.PREF_SIGN_IN);
+        MainSettings mainPrefs = getMainSettings(settingsActivity);
+        Preference signinPref = mainPrefs.findPreference(MainSettings.PREF_SIGN_IN);
         Assert.assertNotNull(signinPref);
         Assert.assertTrue(signinPref instanceof SignInPreference);
         Assert.assertNotNull(signinPref.getOnPreferenceClickListener());

chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/controllers/codelab/SettingsControllerForCodelab.java

@@ -7,16 +7,13 @@ package org.chromium.chrome.test.pagecontroller.controllers.codelab;
 import org.chromium.chrome.test.pagecontroller.controllers.PageController;
 import org.chromium.chrome.test.pagecontroller.utils.IUi2Locator;
 
-// TODO: Implement page controller for MainPreferences.java.  Read
+// TODO: Implement page controller for MainSettings.java.  Read
 // documentation in the PageController class and refer to implemented Page
 // Controllers in the pagecontroller directory for examples.
 
 /**
  * Settings Menu Page Controller for the Code Lab, representing
- * MainPreferences.java.
- *
- * @see <a
- *         href="https://chromium.googlesource.com/chromium/src/+/HEAD/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java">MainPreferences.java</a>
+ * {@link org.chromium.chrome.browser.settings.MainSettings}.
  */
 public class SettingsControllerForCodelab extends PageController {
     // TODO: Replace null with a an actual locator.  Hint, see