From c2a429f4f8960a2ecc22788ecafef1de61d9c5d3 Mon Sep 17 00:00:00 2001
From: Diya Bera <diyab@google.com>
Date: Tue, 17 Jan 2023 20:45:16 +0000
Subject: [PATCH] No scrolling required to see find sensor animation

Changed the string security_settings_sfps_enroll_find_sensor_message.
Changed the layout of the animation.

Test: Manually check the position of the animation
Fixes: 265023019
Change-Id: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638
Merged-In: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638
---
 res/layout/sfps_enroll_find_sensor_layout.xml | 3 ++-
 res/values/dimens.xml                         | 3 +++
 res/values/strings.xml                        | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/layout/sfps_enroll_find_sensor_layout.xml b/res/layout/sfps_enroll_find_sensor_layout.xml
index f08986e113a..b8a656e5c3e 100644
--- a/res/layout/sfps_enroll_find_sensor_layout.xml
+++ b/res/layout/sfps_enroll_find_sensor_layout.xml
@@ -29,7 +29,8 @@
         android:gravity="center_vertical"
         android:orientation="vertical"
         android:clipToPadding="false"
-        android:clipChildren="false">
+        android:clipChildren="false"
+        android:layout_marginTop="@dimen/sfps_enroll_find_sensor_lottie_margin">
 
         <!-- Animation res MUST be set in code because asset is dependent on device orientation -->
         <com.airbnb.lottie.LottieAnimationView
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fd8c9b7c084..5992a613b4f 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -529,4 +529,7 @@
     <dimen name="limited_vision_button_margin_top">0dp</dimen>
     <dimen name="limited_vision_button_margin_bottom">0dp</dimen>
     <dimen name="limited_vision_button_toggle_margin_top">0dp</dimen>
+
+    <!-- Default margin for side fps enroll find sensor lottie -->
+    <dimen name="sfps_enroll_find_sensor_lottie_margin">0dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1dc49a48019..063e7c1f200 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1213,11 +1213,11 @@
     <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
     <string name="security_settings_fingerprint_enroll_find_sensor_message">It\u2019s on the back of your phone. Use your index finger.</string>
     <!-- Message shown in SFPS enrollment dialog to locate the sensor (tablet) [CHAR LIMIT=NONE]-->
-    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the tablet.\n\nPressing the power button turns off the screen.</string>
+    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the tablet.</string>
     <!-- Message shown in SFPS enrollment dialog to locate the sensor (device) [CHAR LIMIT=NONE]-->
-    <string name="security_settings_sfps_enroll_find_sensor_message" product="device">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the device.\n\nPressing the power button turns off the screen.</string>
+    <string name="security_settings_sfps_enroll_find_sensor_message" product="device">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the device.</string>
     <!-- Message shown in SFPS enrollment dialog to locate the sensor (default) [CHAR LIMIT=NONE]-->
-    <string name="security_settings_sfps_enroll_find_sensor_message" product="default">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the phone.\n\nPressing the power button turns off the screen.</string>
+    <string name="security_settings_sfps_enroll_find_sensor_message" product="default">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the phone.</string>
     <!-- Message shown in UDFPS enrollment dialog to locate the sensor [CHAR LIMIT=NONE]-->
     <string name="security_settings_udfps_enroll_find_sensor_message">The fingerprint sensor is on your screen. You\u2019ll capture your fingerprint on the next screen.</string>
     <!-- Button for starting fingerprint enrollment. [CHAR LIMIT=10]-->