Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ba8e6b1 authored by Maurice Lam's avatar Maurice Lam Committed by android-build-merger
Browse files

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

am: 2016b1ac

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

Change-Id: Icfe7e27d60137a69c0a2a4fe78964bb5595b3bd7
parents 36228756 2016b1ac
Loading
Loading
Loading
Loading
+1 −9
Original line number Diff line number Diff line
@@ -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">