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

Commit 93f79d67 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801



Change-Id: Ibf89a7a3b58f076d694e2582ffcd950f5cc54142
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60328e43 c99fa169

res/layout/face_enroll_introduction.xml

+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>

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,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>