diff options
| author | 2024-11-27 15:53:10 -0800 | |
|---|---|---|
| committer | 2024-12-04 22:35:27 +0000 | |
| commit | c9974ad9cb8ff695cfe2ddeb57ae4d5cb3501f9f (patch) | |
| tree | 44994c58af74d298569dc55e8a807d6976ee5c79 | |
| parent | 2dec43c2c187cb240af0b01220f7ad69cae8f866 (diff) | |
m3: make default AlertDialog have Material3 design
Theme_DeviceDefault_Dialog_Alert is used when no theme is specified in
builder. Wear Material3 should override this case.
Flag: android.widget.flags.use_wear_material3_ui
Bug: 379365266
Test: manual
Change-Id: Id662a9304e5d0415469ef4eb12249adf8ea4fe7a
| -rw-r--r-- | core/java/com/android/internal/app/AlertController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index 92f9e6014107..5d4c40853009 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -267,7 +267,9 @@ public class AlertController { return Flags.useWearMaterial3Ui() && CompatChanges.isChangeEnabled(WEAR_MATERIAL3_ALERTDIALOG) && context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH) - && context.getThemeResId() == com.android.internal.R.style.Theme_DeviceDefault; + && (context.getThemeResId() == com.android.internal.R.style.Theme_DeviceDefault + || context.getThemeResId() + == com.android.internal.R.style.Theme_DeviceDefault_Dialog_Alert); } static boolean canTextInput(View v) { |