From 6c72ef89b25df53a70da84c0b0f62850bae9b67b Mon Sep 17 00:00:00 2001
From: Grace Cheng <graciecheng@google.com>
Date: Thu, 29 Sep 2022 19:37:00 +0000
Subject: [PATCH] Show lottie on non-default display density on SFPS

Continue showing lottie when text size/display size is changed on SFPS, because unlike C10/P10, lottie will not overlap text on SFPS

Test: (manual) Change display size and text size to max, verify lottie is visible and does not overlap text
Fixes: 245029066
Change-Id: I041415abc21722052a9adbdc927847c42cd7619f
---
 .../fingerprint/FingerprintEnrollEnrolling.java        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index b44bc27bdda..ff385521819 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -286,8 +286,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         }
 
         mShouldShowLottie = shouldShowLottie();
-        // Only show the lottie if the current display density is the default density.
-        // Otherwise, the lottie will overlap with the settings header text.
+        // On non-SFPS devices, only show the lottie if the current display density is the default
+        // density. Otherwise, the lottie will overlap with the settings header text.
         boolean isLandscape = BiometricUtils.isReverseLandscape(getApplicationContext())
                 || BiometricUtils.isLandscape(getApplicationContext());
 
@@ -771,8 +771,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
             CharSequence announcement = getString(
                     R.string.security_settings_sfps_enroll_progress_a11y_message, percent);
             announceEnrollmentProgress(announcement);
-            // mIllustrationLottie is only shown when current display density = default density,
-            // to prevent overlap with the settings header text.
             if (mIllustrationLottie != null) {
                 mIllustrationLottie.setContentDescription(
                         getString(
@@ -1019,9 +1017,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
 
     private void updateOrientation(int orientation) {
         if (mCanAssumeSfps) {
-            if (mShouldShowLottie) {
-                mIllustrationLottie = findViewById(R.id.illustration_lottie);
-            }
+            mIllustrationLottie = findViewById(R.id.illustration_lottie);
         } else {
             switch(orientation) {
                 case Configuration.ORIENTATION_LANDSCAPE: {