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

Commit a8218384 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "Make GLIF theme default for confirm lock screen" into pi-dev

parents edfdeebf 3e3b8a96

color-check-baseline.xml

+1 −1
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ 
        errorLine1="                android:background="@color/lock_pattern_background" />"

        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/layout-land/confirm_lock_pattern_internal.xml"

            file="res/layout-land/confirm_lock_pattern_normal.xml"

            line="111"

            column="17"/>

    </issue>

res/values-sw600dp/aliases.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
     <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>

     <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>

     <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>

     <item name="confirm_lock_pattern_internal" type="layout">@layout/confirm_lock_pattern_internal_base</item>

     <item name="confirm_lock_pattern_normal" type="layout">@layout/confirm_lock_pattern_normal_base</item>

</resources>