Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2d78d0b..70c5146 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -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">