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

Commit 256a31e2 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev 

am: cdb70789

Change-Id: I9e53821d1cc2666187fd28f05203742c5325381e
parents daa88a82 cdb70789

services/core/java/com/android/server/policy/AccessibilityShortcutController.java

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.policy; 


import android.accessibilityservice.AccessibilityServiceInfo;

import android.app.ActivityManager;

import android.app.ActivityThread;

import android.app.AlertDialog;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -212,7 +213,9 @@ public class AccessibilityShortcutController { 
        final String warningMessage = String.format(

                mContext.getString(R.string.accessibility_shortcut_toogle_warning),

                serviceInfo.getResolveInfo().loadLabel(mContext.getPackageManager()).toString());

        final AlertDialog alertDialog = mFrameworkObjectProvider.getAlertDialogBuilder(mContext)

        final AlertDialog alertDialog = mFrameworkObjectProvider.getAlertDialogBuilder(

                // Use SystemUI context so we pick up any theme set in a vendor overlay

                ActivityThread.currentActivityThread().getSystemUiContext())

                .setTitle(R.string.accessibility_shortcut_warning_dialog_title)

                .setMessage(warningMessage)

                .setCancelable(false)