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

Commit 17703673 authored by Menghan Li's avatar Menghan Li Committed by Automerger Merge Worker
Browse files

Merge "Apply dark theme for volume key shortcut warning dialog" into sc-dev am: f774ba0d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419594

Change-Id: Ice644ef88d2b38e4885d8bcb63e365b71ce5f9e0
parents cb5837ff f774ba0d

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

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