[PwdCheckAndroid] Add icon to change pwd button

This CL ensures all primary change buttons have properly aligned icons.

Screenshot in the bug.

Bug: 1115117, 1092444
Change-Id: I3c60600f27e209d261fd727d20708a19ffbd5fab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353332Reviewed-by: Ioana Pandele <ioanap@chromium.org>
Commit-Queue: Friedrich [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797664}

chrome/browser/password_check/android/internal/BUILD.gn

@@ -67,6 +67,8 @@ android_library("internal_java") {
     "//components/embedder_support/android:util_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
+    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+    "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_preference_preference_java",

chrome/browser/password_check/android/internal/java/res/layout/password_check_compromised_credential_item.xml

@@ -43,9 +43,13 @@
 
         <org.chromium.ui.widget.ButtonCompat
             android:id="@+id/credential_change_button"
+            android:drawablePadding="@dimen/compromised_credential_row_button_icon_padding"
+            android:drawableStart="@drawable/permission_popups"
             android:layout_marginTop="@dimen/compromised_credential_row_button_margin_top"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
+            android:paddingStart="@dimen/compromised_credential_row_button_icon_start_padding"
+            android:paddingEnd="@dimen/compromised_credential_row_button_icon_end_padding"
             android:text="@string/password_check_credential_row_change_button_caption"
             style="@style/FilledButton.Flat" />
 

chrome/browser/password_check/android/internal/java/res/layout/password_check_compromised_credential_with_script_item.xml

@@ -46,8 +46,10 @@
             android:layout_marginTop="@dimen/compromised_credential_row_button_margin_top"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
+            android:paddingStart="@dimen/compromised_credential_row_button_icon_start_padding"
+            android:paddingEnd="@dimen/compromised_credential_row_button_icon_end_padding"
             android:text="@string/password_check_credential_row_change_button_caption"
-            android:drawablePadding="3dp"
+            android:drawablePadding="@dimen/compromised_credential_row_button_icon_padding"
             android:drawableStart="@drawable/ic_autofill_assistant_white_24dp"
             style="@style/FilledButton.Flat" />
 
@@ -64,6 +66,8 @@
             android:layout_marginTop="@dimen/compromised_credential_row_button_margin_top"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="@string/password_check_credential_row_change_manually_button_caption"
             style="@style/TextButton"/>
 

chrome/browser/password_check/android/internal/java/res/values/dimens.xml

@@ -18,6 +18,9 @@
   <dimen name="check_status_message_idle_margin_vertical">27dp</dimen>
   <dimen name="check_status_message_running_margin_vertical">36dp</dimen>
 
+  <dimen name="compromised_credential_row_button_icon_padding">8dp</dimen>
+  <dimen name="compromised_credential_row_button_icon_start_padding">12dp</dimen>
+  <dimen name="compromised_credential_row_button_icon_end_padding">16dp</dimen>
   <dimen name="compromised_credential_row_button_margin_top">16dp</dimen>
   <dimen name="compromised_credential_row_more_padding_end">8dp</dimen>
   <dimen name="compromised_credential_row_more_padding_start">16dp</dimen>

chrome/browser/password_check/android/internal/java/src/org/chromium/chrome/browser/password_check/PasswordCheckViewBinder.java

@@ -19,6 +19,7 @@ import static org.chromium.chrome.browser.password_check.PasswordCheckProperties
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,7 +28,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorRes;
 import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
 
 import org.chromium.chrome.browser.password_check.PasswordCheckProperties.ItemType;
 import org.chromium.chrome.browser.password_check.internal.R;
@@ -144,6 +148,8 @@ class PasswordCheckViewBinder {
             button.setOnClickListener(unusedView -> {
                 model.get(CREDENTIAL_HANDLER).onChangePasswordButtonClick(credential);
             });
+            setTintListForCompoundDrawables(button.getCompoundDrawablesRelative(),
+                    view.getContext(), org.chromium.ui.R.color.default_text_color_inverse);
             if (credential.hasScript()) {
                 ButtonCompat button_with_script =
                         view.findViewById(R.id.credential_change_button_with_script);
@@ -468,4 +474,13 @@ class PasswordCheckViewBinder {
     private static int getDimensionPixelOffset(View view, int resourceId) {
         return view.getContext().getResources().getDimensionPixelOffset(resourceId);
     }
+
+    private static void setTintListForCompoundDrawables(
+            Drawable[] compoundDrawables, Context context, @ColorRes int tintColorList) {
+        for (Drawable drawable : compoundDrawables) {
+            if (drawable == null) continue;
+            DrawableCompat.setTintList(
+                    drawable, AppCompatResources.getColorStateList(context, tintColorList));
+        }
+    }
 }