Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
am: 93f79d6774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801 Change-Id: I4513264127184a92320636fee5cdf48e84ec7752 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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>
|
||||
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user