From bda3c06469836f7021bf716dcbc993124d63f5fc 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
---
 res/layout/sfps_enroll_find_sensor_layout.xml | 3 ++-
 res/values/dimens.xml                         | 3 +++
 res/values/strings.xml                        | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

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 b086c1c928c..33f35a8d10d 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -407,4 +407,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 c861ed9c3c8..722b2e2e845 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -808,6 +808,12 @@
     <string name="security_settings_udfps_enroll_find_sensor_title">How to set up your fingerprint</string>
     <!-- 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.</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.</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.</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]-->