DO NOT MERGE: Set quantum pattern for crypt dialogs
The bug makes the decrypt screen for patterns very hard to use
(white on white).
Bug: 14883421
Change-Id: Icd2c99c3f483d1a9b6571fa1e124322fbf6f3289
(cherry picked from commit 26abe64c3d7e48d2a929d5a9435e0bb4c17d80a4)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aa003af..b96f75b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1510,7 +1510,7 @@
android:immersive="true"
android:launchMode="singleTop"
android:excludeFromRecents="true"
- android:theme="@android:style/Theme.Material.Light.NoActionBar"
+ android:theme="@style/Theme.CryptKeeper"
android:configChanges="keyboard|keyboardHidden|uiMode"
android:windowSoftInputMode="adjustResize">
<intent-filter android:priority="10">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1aec813..9495224 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -131,6 +131,13 @@
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
</style>
+ <style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.Light.NoActionBar">
+ <!-- LockPatternView colors -->
+ <item name="@*android:regularColor">@color/lock_pattern_view_regular_color</item>
+ <item name="@*android:successColor">@color/lock_pattern_view_success_color</item>
+ <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
+ </style>
+
<style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
<item name="android:actionBarWidgetTheme">@null</item>
<item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>