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

Commit 3e3b8a96 authored by Maurice Lam's avatar Maurice Lam
Browse files

Make GLIF theme default for confirm lock screen 

Use GLIF theme as the default for confirm lock screen, even for
"external" launches of the screen. Renamed the theme from "internal"
to "normal" to reflect this change.
Dark theme code will be cleaned up later.

Test: Existing tests pass
Bug: 62573742
Change-Id: I86958eb3a440d7274807f1cf453c3e53c16c23e7
parent f089fb24

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>