From b75baac925cf030400f514c95dd1375e8321600d Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 25 May 2016 16:34:09 -0700
Subject: [PATCH] Make fingerprint inherit from GLIF theme

Set SuwThemeGlif.Light as the parent of fingerprint theme so that it
will inherit the margins and any other attributes.

There should be no visual change other than the fixed margins.

Bug: 28965312
Change-Id: I4e51c501c8ddb0e412e194e47bcee728da151ec5
---
 res/values/themes.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 011957b71b9..ea984e9cdad 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">