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

Commit 0c1d06e3 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Android (Google) Code Review
Browse files

Merge "Fix confirm lock UI theme." into nyc-mr1-dev

parents 3652f20e 0067760b

res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 
    <color name="sim_noitification">@*android:color/material_deep_teal_500</color>



    <color name="warning">#ff5621</color>

    <color name="confirm_device_credential_dark_background">#263238</color>

    <color name="confirm_device_credential_transparent_black">#60000000</color>

    <color name="fab_ripple">#1fffffff</color><!-- 12% white -->

    <color name="fab_shape">?android:attr/colorAccent</color>

res/values/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -269,10 +269,10 @@ 


    <style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.Material">

        <item name="android:colorPrimary">@color/primary_color</item>

        <item name="android:colorPrimaryDark">@color/primary_dark_color</item>

        <item name="android:colorAccent">@color/accent_color_lighter</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:windowBackground">@color/confirm_device_credential_dark_background</item>

        <item name="android:windowBackground">?android:attr/colorPrimary</item>



        <item name="confirmDeviceCredentialsSideMargin">32dp</item>

        <item name="confirmDeviceCredentialsTopMargin">32dp</item>