PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2016b1acdb

* commit '2016b1acdb2839b6559a3e20c51f1eef9fc5719c':
  Make fingerprint inherit from GLIF theme

Change-Id: Icfe7e27d60137a69c0a2a4fe78964bb5595b3bd7
This commit is contained in:
Maurice Lam
2016-05-26 18:57:24 +00:00
committed by android-build-merger
parent 362287567e 2016b1acdb
commit 4ba8e6b176
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/themes.xml
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">