commit 4b5cdf5a72f5f6baeba0035b3cbde61637e535d6
author Ankita Vyas <ankitavyas@google.com> Tue Nov 07 13:19:31 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Nov 07 22:54:44 2023 +0000
tree 8f85117ab82eef1d1843083376d9cc466e0b7703
parent fa90f5329e5bbe145bf009602f8c937201fbd63a

Apply theme to cancel button in progress dialog

Bug: 302698692
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e357d6294db4a988d6f2b64ca97951386a947180)
Merged-In: I4074fc8a9b9634d666404840c6d05338568939e8
Change-Id: I4074fc8a9b9634d666404840c6d05338568939e8

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 179edf8..2f9fd17 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -152,6 +152,11 @@
         <item name="materialAlertDialogTitleTextStyle">@style/AlertDialogTitleStyle</item>
     </style>
 
+    <style name="ProgressDialogCancelButtonStyle"
+           parent="@style/Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+    </style>
+
     <style name="AlertDialogTitleStyle"
            parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text.CenterStacked">
         <item name="android:textColor">?attr/colorOnSurface</item>

src/com/android/providers/media/photopicker/SelectedMediaPreloader.java

diff --git a/src/com/android/providers/media/photopicker/SelectedMediaPreloader.java b/src/com/android/providers/media/photopicker/SelectedMediaPreloader.java
index 8e3273a..71d3400 100644
--- a/src/com/android/providers/media/photopicker/SelectedMediaPreloader.java
+++ b/src/com/android/providers/media/photopicker/SelectedMediaPreloader.java
@@ -31,6 +31,7 @@
 import android.net.Uri;
 import android.os.Looper;
 import android.util.Log;
+import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -308,6 +309,11 @@
                 context.getString(R.string.transcode_cancel), (dialog1, which) -> {
                 mIsPreloadingCancelledLiveData.setValue(true);
             });
+        dialog.create();
+
+        Button cancelButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        cancelButton.setTextAppearance(R.style.ProgressDialogCancelButtonStyle);
+
         dialog.show();
 
         return dialog;