Merge "Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev am: 6829a1dace am: 27eb322ed2 -s ours" into oc-mr1-dev
diff --git a/services/core/java/com/android/server/policy/AccessibilityShortcutController.java b/services/core/java/com/android/server/policy/AccessibilityShortcutController.java
index 0b54e5e..0a8635d 100644
--- a/services/core/java/com/android/server/policy/AccessibilityShortcutController.java
+++ b/services/core/java/com/android/server/policy/AccessibilityShortcutController.java
@@ -18,6 +18,7 @@
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 @@
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)