Merge "(1/n) Fix Face Unlock LottieAnimationView IllustrationViewView ImageView truncate in GlifLayout (face_enroll_education.xml)" into tm-qpr-dev am: 271a57d91b am: c1db187646
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19354194
Change-Id: Ifa88cdb887550248711b25df496191ef232634ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index 2a78f99..fec6d53 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -54,7 +54,7 @@
android:layout_width="match_parent"
android:layout_height="440dp"
android:layout_marginTop="-52dp"
- android:scaleType="centerCrop"
+ android:scaleType="centerInside"
android:visibility="gone"
app:lottie_autoPlay="true"
app:lottie_loop="true"
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"
- android:background="@drawable/face_enroll_icon_large"/>
+ android:src="@drawable/face_enroll_icon_large"/>
</FrameLayout>
@@ -83,7 +83,8 @@
<FrameLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-24dp">
<Button
android:id="@+id/accessibility_button"