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

Commit c99fa169 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev

parents 919a67d2 69cc573b
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:contentDescription="@null"
                android:src="@drawable/face_enroll_intro_illustration"/>
                android:src="@drawable/face_enroll_intro_illustration"
                android:layout_marginBottom="@dimen/face_enroll_intro_illustration_margin_bottom"/>

        </FrameLayout>

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@
    <item name="face_preview_translate_y" format="float" type="dimen">0</item>
    <item name="face_preview_translate_x" format="float" type="dimen">0</item>
    <item name="face_preview_scale" format="float" type="dimen">1.0</item>
    <dimen name="face_enroll_intro_illustration_margin_bottom">0dp</dimen>

    <!-- Confirm device credentials -->
    <dimen name="confirm_credentials_security_method_margin">48dp</dimen>