Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev

This commit is contained in:
Maurice Lam
2016-05-26 18:54:02 +00:00
committed by Android (Google) Code Review

View File

@@ -285,19 +285,11 @@
<item name="android:colorAccent">@*android:color/white</item>
</style>
<style name="Theme.FingerprintEnroll" parent="@*android:style/Theme.Material.Settings.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_glif_light</item>
<item name="android:colorPrimary">@color/suw_color_accent_glif_light</item>
<item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<style name="Theme.FingerprintEnroll" parent="SuwThemeGlif.Light">
<item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Material.Body1</item>
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<item name="suwDividerCondition">both</item>
<item name="suwListItemIconColor">?android:attr/colorAccent</item>
<item name="suwMarginSides">@dimen/suw_layout_margin_sides</item>
</style>
<style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">