am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev

* commit 'b6f5e003a9167c44155906235762f2fac890c66a':
  [FRP] Give pattern lock colors
This commit is contained in:
Maurice Lam
2014-12-08 19:10:20 +00:00
committed by Android Git Automerger
2 changed files with 16 additions and 0 deletions

View File

@@ -40,6 +40,12 @@
<color name="title_color">@android:color/holo_blue_light</color>
<color name="setup_divider_color_dark">#33ffffff</color>
<color name="setup_divider_color_light">#33000000</color>
<color name="setup_lock_pattern_view_regular_color_dark">#ffbdbdbd</color>
<color name="setup_lock_pattern_view_regular_color_light">@color/lock_pattern_view_regular_color</color>
<color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
<color name="setup_lock_pattern_view_success_color_light">@color/setup_wizard_color_accent_light</color>
<color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
<color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
<color name="setup_wizard_color_accent_dark">#ff00e4ff</color>
<color name="setup_wizard_color_accent_light">#ff00828e</color>
<color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>

View File

@@ -46,6 +46,11 @@
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_teal</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<!-- LockPatternView colors -->
<item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_dark</item>
<item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_dark</item>
<item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
</style>
<style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -65,6 +70,11 @@
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_teal</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<!-- LockPatternView colors -->
<item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
<item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
<item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
</style>
<style name="Animation.SetupWizard" parent="@android:style/Animation.Activity">