[Android][Signin] Implement UI for advanced sync flow

This cl creates the new UI for advanced sync flow to be shown under the
MobileIdentityConsistency feature flag

Screenshot: https://crbug.com/1061047#c4

Bug: 1061047
Change-Id: Ia36aefe8b1672d91d87efc0795357374d242a0b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2111153
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755329}

chrome/android/java/res/xml/manage_sync_preferences.xml

@@ -4,7 +4,14 @@
      found in the LICENSE file. -->
 
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <!-- This category is only shown for advanced sync consent flow. -->
+    <PreferenceCategory
+        android:key="syncing_category"
+        android:title="@string/syncing_category"
+        app:isPreferenceVisible="false"/>
 
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="sync_everything"
@@ -59,4 +66,16 @@
         android:key="sync_manage_data"
         android:title="@string/sync_manage_data"/>
 
+    <!-- This category is only shown for advanced sync consent flow. -->
+    <PreferenceCategory
+        android:key="search_and_browse_category"
+        android:title="@string/search_and_browse_category"
+        app:isPreferenceVisible="false">
+
+        <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+            android:key="url_keyed_anonymized_data"
+            android:title="@string/url_keyed_anonymized_data_title"
+            android:summary="@string/url_keyed_anonymized_data_summary"/>
+    </PreferenceCategory>
+
 </PreferenceScreen>

chrome/android/java/src/PRESUBMIT.py

@@ -98,6 +98,7 @@ def _CheckAlertDialogBuilder(input_api, output_api):
       BROWSER_ROOT + 'site_settings/ManageSpaceActivity.java',
       BROWSER_ROOT + 'site_settings/SingleCategorySettings.java',
       BROWSER_ROOT + 'site_settings/SingleWebsiteSettings.java',
+      BROWSER_ROOT + 'sync/settings/ManageSyncSettings.java',
       BROWSER_ROOT + 'sync/settings/SyncAndServicesSettings.java',
       BROWSER_ROOT + 'sync/ui/PassphraseCreationDialogFragment.java',
       BROWSER_ROOT + 'sync/ui/PassphraseDialogFragment.java',

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -1623,6 +1623,12 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_SIGN_IN_SYNC" desc="Sync preference title in signed-in prefs and prefix for notification related to sync [CHAR-LIMIT=32]">
         Sync
       </message>
+      <message name="IDS_SEARCH_AND_BROWSE_CATEGORY" desc="Category to show the search and browse improvement toggle. [CHAR-LIMT=32]">
+        Search and browse
+      </message>
+      <message name="IDS_SYNCING_CATEGORY" desc="Category to separate search and browse section with sync related data types. [CHAR-LIMT=32]">
+        Syncing
+      </message>
       <message name="IDS_SYNC_EVERYTHING_PREF" desc="Title for preference which enables sync'ing of all data types. [CHAR-LIMT=32]">
         Sync everything
       </message>

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SEARCH_AND_BROWSE_CATEGORY.png.sha1

+45431e764e1c7ecd0e78a2302c34739fd95d609c
\ No newline at end of file

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SYNCING_CATEGORY.png.sha1

+af8849eaffb22821671d1323387809a63689ff6f
\ No newline at end of file