Add the pen icon to the address and credit card edit screen.

If editing, display pen icon.
Hide credit card icon when editing.

Bug: 1010841
Change-Id: Ia2b28bbdd403cf999bc2374387482d61363bec8c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1837618Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Ewann Pellé <ewannpv@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702414}

ios/chrome/browser/ui/settings/autofill/autofill_credit_card_edit_table_view_controller.mm

@@ -159,6 +159,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
       _creditCard, GetApplicationContext()->GetApplicationLocale());
   cardholderNameitem.textFieldEnabled = isEditing;
   cardholderNameitem.autofillUIType = AutofillUITypeCreditCardHolderFullName;
+  cardholderNameitem.hideIcon = !isEditing;
   [model addItem:cardholderNameitem
       toSectionWithIdentifier:SectionIdentifierFields];
 
@@ -176,8 +177,12 @@ typedef NS_ENUM(NSInteger, ItemType) {
   cardNumberItem.textFieldEnabled = isEditing;
   cardNumberItem.autofillUIType = AutofillUITypeCreditCardNumber;
   cardNumberItem.keyboardType = UIKeyboardTypeNumberPad;
-  cardNumberItem.identifyingIcon =
-      [self cardTypeIconFromNetwork:_creditCard.network().c_str()];
+  cardNumberItem.hideIcon = !isEditing;
+  // Hide credit card icon when editing.
+  if (!isEditing) {
+    cardNumberItem.identifyingIcon =
+        [self cardTypeIconFromNetwork:_creditCard.network().c_str()];
+  }
   [model addItem:cardNumberItem
       toSectionWithIdentifier:SectionIdentifierFields];
 
@@ -191,6 +196,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
   expirationMonthItem.textFieldEnabled = isEditing;
   expirationMonthItem.autofillUIType = AutofillUITypeCreditCardExpMonth;
   expirationMonthItem.keyboardType = UIKeyboardTypeNumberPad;
+  expirationMonthItem.hideIcon = !isEditing;
   [model addItem:expirationMonthItem
       toSectionWithIdentifier:SectionIdentifierFields];
 
@@ -205,6 +211,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
   expirationYearItem.autofillUIType = AutofillUITypeCreditCardExpYear;
   expirationYearItem.keyboardType = UIKeyboardTypeNumberPad;
   expirationYearItem.returnKeyType = UIReturnKeyDone;
+  expirationYearItem.hideIcon = !isEditing;
   [model addItem:expirationYearItem
       toSectionWithIdentifier:SectionIdentifierFields];
 

ios/chrome/browser/ui/settings/autofill/autofill_profile_edit_table_view_controller.mm

@@ -204,6 +204,7 @@ static const AutofillFieldDisplayInfo kFieldsToDisplay[] = {
         autofill::AutofillType(field.autofillType), locale));
     item.autofillUIType = AutofillUITypeFromAutofillType(field.autofillType);
     item.textFieldEnabled = self.tableView.editing;
+    item.hideIcon = !self.tableView.editing;
     item.autoCapitalizationType = field.autoCapitalizationType;
     item.returnKeyType = field.returnKeyType;
     item.keyboardType = field.keyboardType;