diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java index 83def0cc1fd6a..49a3e29b9d88f 100644 --- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java +++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java @@ -32,6 +32,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.database.ContentObserver; import android.media.AudioAttributes; import android.media.Ringtone; @@ -597,7 +598,11 @@ public class AccessibilityShortcutController { } public AlertDialog.Builder getAlertDialogBuilder(Context context) { - return new AlertDialog.Builder(context); + final boolean inNightMode = (context.getResources().getConfiguration().uiMode + & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES; + final int themeId = inNightMode ? R.style.Theme_DeviceDefault_Dialog_Alert : + R.style.Theme_DeviceDefault_Light_Dialog_Alert; + return new AlertDialog.Builder(context, themeId); } public Toast makeToastFromText(Context context, CharSequence charSequence, int duration) {