[Metadata][Android] Update icon dimension for card art on Settings page

Update custom icon dimensions 32 x 20 -> 40 x 24 on "Payment methods"
and "Edit card" pages.

Payment methods page
Mock: https://www.figma.com/file/N6F3DN9prdEzQiylOtVBCW/X-PA-share?node-id=2-7334&t=tHB6xlatk0CGPBjx-0
Current: https://screenshot.googleplex.com/9hXssgDwN7hefkt
New: https://screenshot.googleplex.com/AbMbYZNW3X9G2Aw

Edit card page
Mock: https://www.figma.com/file/N6F3DN9prdEzQiylOtVBCW/X-PA-share?node-id=2-7011&t=tHB6xlatk0CGPBjx-0
Current: https://screenshot.googleplex.com/5JBvMxcC5QuGHag
New: https://screenshot.googleplex.com/9Lr9bV24CC67fmR

Note: Only custom icon dimensions are updated. Network icon dimensions
will be updated in a future change. All updates are behind
AutofillEnableNewCardArtAndNetworkImages flag.

(cherry picked from commit ac96bff)

Bug: 1417919, 1427669
Change-Id: I31b95e22e6624be3102e1dcbf1bd6be1aa5e467f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4357238
Reviewed-by: Friedrich Horschig <fhorschig@chromium.org>
Reviewed-by: Lijin Shen <lazzzis@google.com>
Commit-Queue: Vishwas Uppoor <vishwasuppoor@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1122057}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4373879
Cr-Commit-Position: refs/branch-heads/5672@{#75}
Cr-Branched-From: 5f2a724-refs/heads/main@{#1121455}

Author: Vishwas Uppoor

chrome/android/java/res/layout/autofill_server_card_editor.xml

@@ -16,8 +16,8 @@ found in the LICENSE file.
 
         <ImageView
             android:id="@+id/card_icon"
-            android:layout_width="@dimen/settings_page_card_icon_width"
-            android:layout_height="@dimen/settings_page_card_icon_height"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:layout_marginEnd="@dimen/settings_page_card_icon_end_margin"

chrome/android/java/res/values/dimens.xml

@@ -400,12 +400,6 @@ found in the LICENSE file.
     <!-- Price Drop dimensions -->
     <dimen name="price_drop_spotted_iph_ntp_tabswitcher_y_inset">4dp</dimen>
 
-    <!-- Settings page -->
-    <dimen name="settings_page_card_icon_width">32dp</dimen>
-    <dimen name="settings_page_card_icon_height">20dp</dimen>
-    <dimen name="settings_page_card_icon_end_margin">20dp</dimen>
-    <dimen name="settings_page_margin_between_card_name_and_last_four_digits">4dp</dimen>
-
     <!-- Card Unmask dialog -->
     <dimen name="card_unmask_dialog_credit_card_icon_width">32dp</dimen>
     <dimen name="card_unmask_dialog_credit_card_icon_height">20dp</dimen>

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

@@ -4,6 +4,10 @@
 
 package org.chromium.chrome.browser.autofill.settings;
 
+import static org.chromium.chrome.browser.autofill.AutofillUiUtils.getCardIcon;
+import static org.chromium.chrome.browser.autofill.AutofillUiUtils.getSettingsPageIconHeightId;
+import static org.chromium.chrome.browser.autofill.AutofillUiUtils.getSettingsPageIconWidthId;
+
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ -22,7 +26,6 @@
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.AutofillEditorBase;
-import org.chromium.chrome.browser.autofill.AutofillUiUtils;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.feedback.FragmentHelpAndFeedbackLauncher;
@@ -150,8 +153,8 @@ public boolean isPreferenceClickDisabled(Preference preference) {
             }
 
             // Set card icon. It can be either a custom card art or a network icon.
-            card_pref.setIcon(AutofillUiUtils.getCardIcon(getStyledContext(), card,
-                    R.dimen.settings_page_card_icon_width, R.dimen.settings_page_card_icon_height));
+            card_pref.setIcon(getCardIcon(getStyledContext(), card, getSettingsPageIconWidthId(),
+                    getSettingsPageIconHeightId()));
 
             if (card.getIsLocal()) {
                 card_pref.setFragment(AutofillLocalCardEditor.class.getName());

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

@@ -4,6 +4,10 @@
 
 package org.chromium.chrome.browser.autofill.settings;
 
+import static org.chromium.chrome.browser.autofill.AutofillUiUtils.getCardIcon;
+import static org.chromium.chrome.browser.autofill.AutofillUiUtils.getSettingsPageIconHeightId;
+import static org.chromium.chrome.browser.autofill.AutofillUiUtils.getSettingsPageIconWidthId;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -22,7 +26,6 @@
 import org.chromium.build.annotations.UsedByReflection;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeStringConstants;
-import org.chromium.chrome.browser.autofill.AutofillUiUtils;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
@@ -148,8 +151,8 @@ public View onCreateView(
 
         // Set card icon. It can be either a custom card art or the network icon.
         ImageView cardIconContainer = v.findViewById(R.id.card_icon);
-        cardIconContainer.setImageDrawable(AutofillUiUtils.getCardIcon(getContext(), mCard,
-                R.dimen.settings_page_card_icon_width, R.dimen.settings_page_card_icon_height));
+        cardIconContainer.setImageDrawable(getCardIcon(
+                getContext(), mCard, getSettingsPageIconWidthId(), getSettingsPageIconHeightId()));
 
         ((TextView) v.findViewById(R.id.card_name)).setText(mCard.getCardNameForAutofillDisplay());
         ((TextView) v.findViewById(R.id.card_last_four))

chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillUiUtils.java

@@ -525,4 +525,20 @@ public static Drawable getCardIcon(
                 true);
         return new BitmapDrawable(resources, scaledBitmap);
     }
+
+    public static int getSettingsPageIconWidthId() {
+        if (ChromeFeatureList.isEnabled(
+                    ChromeFeatureList.AUTOFILL_ENABLE_NEW_CARD_ART_AND_NETWORK_IMAGES)) {
+            return R.dimen.settings_page_card_icon_width_new;
+        }
+        return R.dimen.settings_page_card_icon_width;
+    }
+
+    public static int getSettingsPageIconHeightId() {
+        if (ChromeFeatureList.isEnabled(
+                    ChromeFeatureList.AUTOFILL_ENABLE_NEW_CARD_ART_AND_NETWORK_IMAGES)) {
+            return R.dimen.settings_page_card_icon_height_new;
+        }
+        return R.dimen.settings_page_card_icon_height;
+    }
 }

components/autofill/android/java/res/values/dimens.xml

@@ -44,4 +44,12 @@ found in the LICENSE file.
     <dimen name="editable_option_section_logo_width">48dp</dimen>
     <dimen name="editable_option_section_logo_horizontal_padding">5dp</dimen>
     <dimen name="editable_option_section_logo_vertical_padding">13dp</dimen>
+
+    <!-- Settings page -->
+    <dimen name="settings_page_card_icon_width">32dp</dimen>
+    <dimen name="settings_page_card_icon_height">20dp</dimen>
+    <dimen name="settings_page_card_icon_width_new">40dp</dimen>
+    <dimen name="settings_page_card_icon_height_new">24dp</dimen>
+    <dimen name="settings_page_card_icon_end_margin">20dp</dimen>
+    <dimen name="settings_page_margin_between_card_name_and_last_four_digits">4dp</dimen>
 </resources>