Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9974ad9 authored by Chen Bai's avatar Chen Bai
Browse files

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
parent 2dec43c2

core/java/com/android/internal/app/AlertController.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {