[Unity][Android] Remove 'Preload pages…' toggle from SyncAndServicesPreferences

This CL removes 'Preload pages…' toggle from SyncAndServicesPreferences,
moving it back to Privacy preferences page. It also reorders preference rows in
PrivacyPreferences if UnifiedConsent is enabled, putting 'Preload pages…' below
'Access payment methods' row. Title and summary of 'Preload pages…' in
PrivacyPreferences are also updated.

Bug: 925884
Change-Id: Ifcc58d71ecc6e22781ff5319a442e6293e086a22
Reviewed-on: https://chromium-review.googlesource.com/c/1472697Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632831}

chrome/android/java/res/xml/sync_and_services_preferences.xml

@@ -37,11 +37,6 @@
             android:title="@string/autocomplete_searches_and_urls_title"
             android:summary="@string/autocomplete_searches_and_urls_summary"
             android:persistent="false"/>
-        <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
-            android:key="network_predictions"
-            android:title="@string/preload_pages_title"
-            android:summary="@string/preload_pages_summary"
-            android:persistent="false"/>
         <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
             android:key="navigation_error"
             android:title="@string/navigation_error_suggestions_title"

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncAndServicesPreferences.java

@@ -31,7 +31,6 @@ import android.view.ViewGroup;
 import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
-import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.contextual_suggestions.ContextualSuggestionsEnabledStateUtils;
@@ -80,7 +79,6 @@ public class SyncAndServicesPreferences extends PreferenceFragment
 
     private static final String PREF_SERVICES_CATEGORY = "services_category";
     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
-    private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
     private static final String PREF_NAVIGATION_ERROR = "navigation_error";
     private static final String PREF_SAFE_BROWSING = "safe_browsing";
     private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
@@ -118,7 +116,6 @@ public class SyncAndServicesPreferences extends PreferenceFragment
     private ChromeSwitchPreference mSyncRequested;
 
     private ChromeSwitchPreference mSearchSuggestions;
-    private ChromeSwitchPreference mNetworkPredictions;
     private ChromeSwitchPreference mNavigationError;
     private ChromeSwitchPreference mSafeBrowsing;
     private ChromeSwitchPreference mSafeBrowsingReporting;
@@ -169,10 +166,6 @@ public class SyncAndServicesPreferences extends PreferenceFragment
         mSearchSuggestions.setOnPreferenceChangeListener(this);
         mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
-        mNetworkPredictions = (ChromeSwitchPreference) findPreference(PREF_NETWORK_PREDICTIONS);
-        mNetworkPredictions.setOnPreferenceChangeListener(this);
-        mNetworkPredictions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-
         mNavigationError = (ChromeSwitchPreference) findPreference(PREF_NAVIGATION_ERROR);
         mNavigationError.setOnPreferenceChangeListener(this);
         mNavigationError.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
@@ -315,9 +308,6 @@ public class SyncAndServicesPreferences extends PreferenceFragment
             mPrefServiceBridge.setSafeBrowsingEnabled((boolean) newValue);
         } else if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
             mPrefServiceBridge.setSafeBrowsingExtendedReportingEnabled((boolean) newValue);
-        } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-            mPrefServiceBridge.setNetworkPredictionEnabled((boolean) newValue);
-            recordNetworkPredictionEnablingUMA((boolean) newValue);
         } else if (PREF_NAVIGATION_ERROR.equals(key)) {
             mPrefServiceBridge.setResolveNavigationErrorEnabled((boolean) newValue);
         } else if (PREF_USAGE_AND_CRASH_REPORTING.equals(key)) {
@@ -483,11 +473,6 @@ public class SyncAndServicesPreferences extends PreferenceFragment
         }
     }
 
-    private void recordNetworkPredictionEnablingUMA(boolean enabled) {
-        // Report user turning on and off NetworkPrediction.
-        RecordHistogram.recordBooleanHistogram("PrefService.NetworkPredictionEnabled", enabled);
-    }
-
     private static void removePreference(PreferenceGroup from, Preference preference) {
         boolean found = from.removePreference(preference);
         assert found : "Don't have such preference! Preference key: " + preference.getKey();
@@ -497,7 +482,6 @@ public class SyncAndServicesPreferences extends PreferenceFragment
         updateSyncPreferences();
 
         mSearchSuggestions.setChecked(mPrefServiceBridge.isSearchSuggestEnabled());
-        mNetworkPredictions.setChecked(mPrefServiceBridge.getNetworkPredictionEnabled());
         mNavigationError.setChecked(mPrefServiceBridge.isResolveNavigationErrorEnabled());
         mSafeBrowsing.setChecked(mPrefServiceBridge.isSafeBrowsingEnabled());
         mSafeBrowsingReporting.setChecked(
@@ -560,9 +544,6 @@ public class SyncAndServicesPreferences extends PreferenceFragment
             if (PREF_SAFE_BROWSING.equals(key)) {
                 return mPrefServiceBridge.isSafeBrowsingManaged();
             }
-            if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-                return mPrefServiceBridge.isNetworkPredictionManaged();
-            }
             if (PREF_USAGE_AND_CRASH_REPORTING.equals(key)) {
                 return mPrefServiceBridge.isMetricsReportingManaged();
             }

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

@@ -72,16 +72,33 @@ public class PrivacyPreferences extends PreferenceFragment
                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
         canMakePaymentPref.setOnPreferenceChangeListener(this);
 
+        ChromeBaseCheckBoxPreference networkPredictionPref =
+                (ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS);
+        networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled());
+        networkPredictionPref.setOnPreferenceChangeListener(this);
+        networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
             // Remove preferences that were migrated to SyncAndServicesPreferences.
             preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
             preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
             preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING));
             preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING));
-            preferenceScreen.removePreference(findPreference(PREF_NETWORK_PREDICTIONS));
             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
             preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
 
+            // TODO(https://crbug.com/846376): Update strings in XML after UNIFIED_CONSENT launch.
+            networkPredictionPref.setTitle(R.string.preload_pages_title);
+            networkPredictionPref.setSummary(R.string.preload_pages_summary);
+
+            // Put networkPredictionPref after canMakePaymentPref by overriding order value.
+            // However, calling setOrder doesn't change existing order if Preference has already
+            // been added to PreferenceGroup. Remove and re-add it to work around this.
+            // TODO(https://crbug.com/846376): Reorder prefs in XML after UNIFIED_CONSENT launch.
+            preferenceScreen.removePreference(networkPredictionPref);
+            networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
+            preferenceScreen.addPreference(networkPredictionPref);
+
             Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
             NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(view -> {
                 PreferencesLauncher.launchSettingsPage(getActivity(),
@@ -98,12 +115,6 @@ public class PrivacyPreferences extends PreferenceFragment
         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
 
-        ChromeBaseCheckBoxPreference networkPredictionPref =
-                (ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS);
-        networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled());
-        networkPredictionPref.setOnPreferenceChangeListener(this);
-        networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-
         ChromeBaseCheckBoxPreference navigationErrorPref =
                 (ChromeBaseCheckBoxPreference) findPreference(PREF_NAVIGATION_ERROR);
         navigationErrorPref.setOnPreferenceChangeListener(this);