[iOS] Add MICE Settings proposal that separates Sync & Google Services.

- Adds the entrypoint to Settings from NTP profile image.
- Updates the Settings screen to separate Sync from Google Services.
- Adds the new G icon for Google Services.

https://drive.google.com/file/d/1EdCu2VT7I8DBERCr-SZlXXBlZh9OVaNS/view?usp=sharing

Bug: 1125631
Change-Id: I6354c7e93d116b0ed69f54100988e38a8bff7529
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442794
Commit-Queue: Nohemi Fernandez <fernandex@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814285}

ios/chrome/app/strings/ios_strings.grd

@@ -885,9 +885,15 @@ Because your account is managed by <ph name="HOSTED_DOMAIN">$1<ex>google.com</ex
       <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_SIGN_IN_DETAIL_TEXT" desc="Invite the user to sign-in and explains the benefit. [iOS only]">
         Sync and personalize across devices.
       </message>
-      <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_TITLE" desc="Title for the view in the Settings for enabling/disabling Sync and all the Google services. [Length: 26em] [iOS only]">
+      <message name="IDS_IOS_GOOGLE_SERVICES_SYNC_SETTINGS_TITLE" desc="Title for the view in the Settings for enabling/disabling Sync and all the Google services. [Length: 26em] [iOS only]">
         Sync and Google Services
       </message>
+      <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_TITLE" desc="Title for the view in the Settings for enabling/disabling Google services. [Length: 26em] [iOS only]">
+        Google Services
+      </message>
+      <message name="IDS_IOS_GOOGLE_SYNC_SETTINGS_TITLE" desc="Title for the view in the Settings for enabling/disabling Sync. [Length: 26em] [iOS only]">
+        Sync
+      </message>
       <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_SYNC_DISABLBED_BY_ADMINISTRATOR_STATUS" desc="Error displayed when the sync is disabled by the enterprise policy. The user doesn't have a regular gmail account.">
         Sync is disabled by your administrator
       </message>

ios/chrome/app/strings/ios_strings_grd/IDS_IOS_GOOGLE_SERVICES_SETTINGS_TITLE.png.sha1

+43b73968521e12aff187d33b60f4c12a96f1ad64
\ No newline at end of file

ios/chrome/app/strings/ios_strings_grd/IDS_IOS_GOOGLE_SERVICES_SYNC_SETTINGS_TITLE.png.sha1

+c86d9bbb7aa35a76e82b590c1ee426731ba9bbf5
\ No newline at end of file

ios/chrome/app/strings/ios_strings_grd/IDS_IOS_GOOGLE_SYNC_SETTINGS_TITLE.png.sha1

+43b73968521e12aff187d33b60f4c12a96f1ad64
\ No newline at end of file

ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator.mm

@@ -4,6 +4,7 @@
 
 #import "ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_promo_signin_coordinator.h"
 
+#import "components/signin/public/base/account_consistency_method.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/main/browser.h"
 #import "ios/chrome/browser/ui/authentication/signin/signin_coordinator+protected.h"
@@ -75,6 +76,7 @@
 
 - (void)start {
   [super start];
+  DCHECK(base::FeatureList::IsEnabled(signin::kMobileIdentityConsistency));
   self.identityChooserCoordinator = [[IdentityChooserCoordinator alloc]
       initWithBaseViewController:self.baseViewController
                          browser:self.browser];

ios/chrome/browser/ui/content_suggestions/content_suggestions_header_view_controller.mm

@@ -9,6 +9,7 @@
 #include "base/ios/ios_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/metrics/user_metrics.h"
+#include "components/signin/public/base/account_consistency_method.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ntp/new_tab_page_tab_helper.h"
 #import "ios/chrome/browser/ui/commands/application_commands.h"
@@ -446,7 +447,11 @@ const NSString* kScribbleFakeboxElementId = @"fakebox";
 
 - (void)identityDiscTapped {
   base::RecordAction(base::UserMetricsAction("MobileNTPIdentityDiscTapped"));
-  [self.dispatcher showGoogleServicesSettingsFromViewController:nil];
+  if (base::FeatureList::IsEnabled(signin::kMobileIdentityConsistency)) {
+    [self.dispatcher showSettingsFromViewController:self];
+  } else {
+    [self.dispatcher showGoogleServicesSettingsFromViewController:nil];
+  }
 }
 
 // TODO(crbug.com/807330) The fakebox is currently a collection of views spread

ios/chrome/browser/ui/settings/BUILD.gn

@@ -83,6 +83,7 @@ source_set("settings") {
     "resources:settings_content_settings",
     "resources:settings_debug",
     "resources:settings_error",
+    "resources:settings_google_services",
     "resources:settings_info",
     "resources:settings_language_settings",
     "resources:settings_passwords",

ios/chrome/browser/ui/settings/resources/BUILD.gn

@@ -184,6 +184,14 @@ imageset("sync_and_google_services_sync_on") {
   ]
 }
 
+imageset("settings_google_services") {
+  sources = [
+    "settings_google_services.imageset/Contents.json",
+    "settings_google_services.imageset/settings_google_services@2x.png",
+    "settings_google_services.imageset/settings_google_services@3x.png",
+  ]
+}
+
 imageset("settings_unsafe_state") {
   sources = [
     "settings_unsafe_state.imageset/Contents.json",

ios/chrome/browser/ui/settings/resources/settings_google_services.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "settings_google_services@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "settings_google_services@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/chrome/browser/ui/settings/settings_table_view_controller.mm

@@ -21,6 +21,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/search_engines_pref_names.h"
 #include "components/search_engines/util.h"
+#include "components/signin/public/base/account_consistency_method.h"
 #include "components/signin/public/base/signin_metrics.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #import "components/signin/public/identity_manager/objc/identity_manager_observer_bridge.h"
@@ -114,6 +115,7 @@ NSString* const kSyncAndGoogleServicesSyncOffImageName =
     @"sync_and_google_services_sync_off";
 NSString* const kSyncAndGoogleServicesSyncOnImageName =
     @"sync_and_google_services_sync_on";
+NSString* const kSettingsGoogleServicesImageName = @"settings_google_services";
 NSString* const kSettingsSearchEngineImageName = @"settings_search_engine";
 NSString* const kSettingsPasswordsImageName = @"settings_passwords";
 NSString* const kSettingsAutofillCreditCardImageName =
@@ -147,7 +149,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
   ItemTypeSignInButton = kItemTypeEnumZero,
   ItemTypeSigninPromo,
   ItemTypeAccount,
-  ItemGoogleServices,
+  ItemTypeSyncAndGoogleServices,
   ItemTypeHeader,
   ItemTypeSearchEngine,
   ItemTypeManagedDefaultSearchEngine,
@@ -428,12 +430,21 @@ NSString* kDevViewSourceKey = @"DevViewSource";
         toSectionWithIdentifier:SectionIdentifierAccount];
   }
   if (![model hasSectionForSectionIdentifier:SectionIdentifierAccount]) {
-    // Add the Account section for the Google services cell, if the user is
-    // signed-out.
+    // Add the Account section for the Sync & Google services cell, if the user
+    // is signed-out.
     [model addSectionWithIdentifier:SectionIdentifierAccount];
   }
-  [model addItem:[self googleServicesCellItem]
-      toSectionWithIdentifier:SectionIdentifierAccount];
+
+  // Adds experimental Google Services item separate from Sync.
+  if (base::FeatureList::IsEnabled(signin::kMobileIdentityConsistency)) {
+    [model addItem:[self syncCellItem]
+        toSectionWithIdentifier:SectionIdentifierAccount];
+    [model addItem:[self googleServicesCellItem]
+        toSectionWithIdentifier:SectionIdentifierAccount];
+  } else {
+    [model addItem:[self syncAndGoogleServicesCellItem]
+        toSectionWithIdentifier:SectionIdentifierAccount];
+  }
 
   // Defaults section.
   if (@available(iOS 14, *)) {
@@ -547,17 +558,45 @@ NSString* kDevViewSourceKey = @"DevViewSource";
 }
 
 - (TableViewItem*)googleServicesCellItem {
+  TableViewImageItem* googleServicesItem =
+      [[TableViewImageItem alloc] initWithType:ItemTypeSyncAndGoogleServices];
+  googleServicesItem.accessoryType =
+      UITableViewCellAccessoryDisclosureIndicator;
+  googleServicesItem.title =
+      l10n_util::GetNSString(IDS_IOS_GOOGLE_SERVICES_SETTINGS_TITLE);
+  googleServicesItem.accessibilityIdentifier = kSettingsGoogleServicesCellId;
+  googleServicesItem.image =
+      [UIImage imageNamed:kSettingsGoogleServicesImageName];
+  return googleServicesItem;
+}
+
+- (TableViewItem*)syncCellItem {
   // TODO(crbug.com/805214): This branded icon image needs to come from
   // BrandedImageProvider.
   TableViewImageItem* googleServicesItem =
-      [[TableViewImageItem alloc] initWithType:ItemGoogleServices];
+      [[TableViewImageItem alloc] initWithType:ItemTypeSyncAndGoogleServices];
   googleServicesItem.accessoryType =
       UITableViewCellAccessoryDisclosureIndicator;
   googleServicesItem.title =
-      l10n_util::GetNSString(IDS_IOS_GOOGLE_SERVICES_SETTINGS_TITLE);
+      l10n_util::GetNSString(IDS_IOS_GOOGLE_SYNC_SETTINGS_TITLE);
+  googleServicesItem.accessibilityIdentifier =
+      kSettingsGoogleSyncAndServicesCellId;
+  [self updateSyncAndGoogleServicesItem:googleServicesItem];
+  return googleServicesItem;
+}
+
+- (TableViewItem*)syncAndGoogleServicesCellItem {
+  // TODO(crbug.com/805214): This branded icon image needs to come from
+  // BrandedImageProvider.
+  TableViewImageItem* googleServicesItem =
+      [[TableViewImageItem alloc] initWithType:ItemTypeSyncAndGoogleServices];
+  googleServicesItem.accessoryType =
+      UITableViewCellAccessoryDisclosureIndicator;
+  googleServicesItem.title =
+      l10n_util::GetNSString(IDS_IOS_GOOGLE_SERVICES_SYNC_SETTINGS_TITLE);
   googleServicesItem.accessibilityIdentifier =
       kSettingsGoogleSyncAndServicesCellId;
-  [self updateGoogleServicesItem:googleServicesItem];
+  [self updateSyncAndGoogleServicesItem:googleServicesItem];
   return googleServicesItem;
 }
 
@@ -956,7 +995,7 @@ NSString* kDevViewSourceKey = @"DevViewSource";
       controller = [[AccountsTableViewController alloc] initWithBrowser:_browser
                                               closeSettingsOnAddAccount:NO];
       break;
-    case ItemGoogleServices:
+    case ItemTypeSyncAndGoogleServices:
       base::RecordAction(base::UserMetricsAction("Settings.GoogleServices"));
       [self showSyncGoogleService];
       break;
@@ -1232,9 +1271,10 @@ NSString* kDevViewSourceKey = @"DevViewSource";
   }
 }
 
-// Updates the Google services item to display the right icon and status message
-// in the detail text of the cell.
-- (void)updateGoogleServicesItem:(TableViewImageItem*)googleServicesItem {
+// Updates the Sync & Google services item to display the right icon and status
+// message in the detail text of the cell.
+- (void)updateSyncAndGoogleServicesItem:
+    (TableViewImageItem*)googleServicesItem {
   googleServicesItem.detailTextColor = nil;
   syncer::SyncService* syncService =
       ProfileSyncServiceFactory::GetForBrowserState(_browserState);
@@ -1279,15 +1319,15 @@ NSString* kDevViewSourceKey = @"DevViewSource";
 }
 
 // Updates and reloads the Google service cell.
-- (void)reloadGoogleServicesCell {
+- (void)reloadSyncAndGoogleServicesCell {
   NSIndexPath* googleServicesCellIndexPath =
-      [self.tableViewModel indexPathForItemType:ItemGoogleServices
+      [self.tableViewModel indexPathForItemType:ItemTypeSyncAndGoogleServices
                               sectionIdentifier:SectionIdentifierAccount];
   TableViewImageItem* googleServicesItem =
       base::mac::ObjCCast<TableViewImageItem>(
           [self.tableViewModel itemAtIndexPath:googleServicesCellIndexPath]);
   DCHECK(googleServicesItem);
-  [self updateGoogleServicesItem:googleServicesItem];
+  [self updateSyncAndGoogleServicesItem:googleServicesItem];
   [self reconfigureCellsForItems:@[ googleServicesItem ]];
 }
 
@@ -1378,7 +1418,7 @@ NSString* kDevViewSourceKey = @"DevViewSource";
 #pragma mark SyncObserverModelBridge
 
 - (void)onSyncStateChanged {
-  [self reloadGoogleServicesCell];
+  [self reloadSyncAndGoogleServicesCell];
 }
 
 #pragma mark - IdentityRefreshLogic

ios/chrome/browser/ui/settings/settings_table_view_controller_constants.h

@@ -28,6 +28,9 @@ extern NSString* const kSettingsVoiceSearchCellId;
 // The accessibility identifier of the Sync and Google services cell.
 extern NSString* const kSettingsGoogleSyncAndServicesCellId;
 
+// The accessibility identifier of the Google services cell.
+extern NSString* const kSettingsGoogleServicesCellId;
+
 // The accessibility identifier of the Passwords cell.
 extern NSString* const kSettingsPasswordsCellId;
 

ios/chrome/browser/ui/settings/settings_table_view_controller_constants.mm

@@ -17,6 +17,8 @@ NSString* const kSettingsManagedSearchEngineCellId =
 NSString* const kSettingsVoiceSearchCellId = @"kSettingsVoiceSearchCellId";
 NSString* const kSettingsGoogleSyncAndServicesCellId =
     @"kSettingsGoogleSyncAndServicesCellId";
+NSString* const kSettingsGoogleServicesCellId =
+    @"kSettingsGoogleServicesCellId";
 NSString* const kSettingsPasswordsCellId = @"kSettingsPasswordsCellId";
 NSString* const kSettingsPaymentMethodsCellId =
     @"kSettingsPaymentMethodsCellId";

ios/chrome/test/earl_grey/chrome_matchers_app_interface.mm

@@ -553,14 +553,9 @@ UIView* SubviewWithAccessibilityIdentifier(NSString* accessibility_id,
 }
 
 + (id<GREYMatcher>)googleServicesSettingsButton {
-  NSString* syncAndGoogleServicesTitle =
-      l10n_util::GetNSStringWithFixup(IDS_IOS_GOOGLE_SERVICES_SETTINGS_TITLE);
-  id<GREYMatcher> mainTextLabelMatcher =
-      grey_allOf(grey_accessibilityLabel(syncAndGoogleServicesTitle),
-                 grey_sufficientlyVisible(), nil);
-  return grey_allOf(grey_kindOfClass([UITableViewCell class]),
-                    grey_sufficientlyVisible(),
-                    grey_descendant(mainTextLabelMatcher), nil);
+  return grey_allOf(
+      grey_kindOfClass([UITableViewCell class]), grey_sufficientlyVisible(),
+      grey_accessibilityID(kSettingsGoogleSyncAndServicesCellId), nil);
 }
 
 + (id<GREYMatcher>)googleServicesSettingsView {