diff options
| author | Selim Cinek <cinek@google.com> | 2014-06-05 16:14:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 16:14:09 +0000 |
| commit | 67f2cd78f206f4d80caa6513d08dfdbc853450c2 (patch) | |
| tree | edba2826ebbfb7e5642b8c789be5352d7b225639 | |
| parent | 77d1f1a41208406bf7a3f4950ebfd647902ea295 (diff) | |
| parent | 3b9f33b4b82bf2bb776ca917c29eb4b466d05888 (diff) | |
| download | packages_apps_Settings-67f2cd78f206f4d80caa6513d08dfdbc853450c2.tar.gz packages_apps_Settings-67f2cd78f206f4d80caa6513d08dfdbc853450c2.tar.bz2 packages_apps_Settings-67f2cd78f206f4d80caa6513d08dfdbc853450c2.zip | |
am 3b9f33b4: Merge "Updated the colors of the lock pattern" into lmp-preview-dev
* commit '3b9f33b4b82bf2bb776ca917c29eb4b466d05888':
Updated the colors of the lock pattern
| -rw-r--r-- | res/values/colors.xml | 5 | ||||
| -rw-r--r-- | res/values/themes.xml | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 02e08c60e..a0c560147 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -42,7 +42,10 @@ <color name="circle_avatar_frame_shadow_color">#80000000</color> <color name="circle_avatar_frame_pressed_color">#ffffffff</color> - <color name="lock_pattern_background">#8000</color> + <color name="lock_pattern_background">#00000000</color> + <color name="lock_pattern_view_regular_color">#ff37474f</color> + <color name="lock_pattern_view_success_color">#ff009688</color> + <color name="lock_pattern_view_error_color">#fff4511e</color> <color name="quantum_blue_grey_50">#ffeceff1</color> <color name="quantum_blue_grey_100">#ffcfd8dc</color> diff --git a/res/values/themes.xml b/res/values/themes.xml index 402f6ddee..41091e7db 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -83,6 +83,12 @@ <item name="android:actionBarStyle">@style/Theme.ActionBar</item> <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item> + + <!-- 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.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid"> |