From 7eb40da9c4d73c4ecffea13efe27e8f1fd344ed8 Mon Sep 17 00:00:00 2001
From: Diya Bera <diyab@google.com>
Date: Fri, 3 Feb 2023 23:16:37 +0000
Subject: [PATCH 1/2] Add animation for progress bar and lottie in fingerprint
 enrollment

Test: Manual - While enrolling a fingerprint, onHelp will cause the
lottie and progress bar to shake
Bug: 266838595

Change-Id: I547d86182a87846aca7d025b35a008675f449e2e
Merged-in: I547d86182a87846aca7d025b35a008675f449e2e
---
 res/layout/sfps_enroll_enrolling.xml          |  4 +++-
 .../FingerprintEnrollEnrolling.java           | 19 +++++++++++++++++++
 .../FingerprintEnrollEnrollingTest.java       | 12 ++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/res/layout/sfps_enroll_enrolling.xml b/res/layout/sfps_enroll_enrolling.xml
index 498d751a055..e0f9d1f8454 100644
--- a/res/layout/sfps_enroll_enrolling.xml
+++ b/res/layout/sfps_enroll_enrolling.xml
@@ -32,11 +32,13 @@
         android:clipChildren="false">
 
         <RelativeLayout
+            android:id="@+id/progress_lottie"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:translationX="0dp">
 
             <!-- Animation res MUST be set in code -->
             <com.airbnb.lottie.LottieAnimationView
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 0b30f879bc6..c76a58a5043 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -53,10 +53,12 @@ import android.view.Surface;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.IdRes;
@@ -185,6 +187,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
     private boolean mHaveShownSfpsLeftEdgeLottie;
     private boolean mHaveShownSfpsRightEdgeLottie;
     private boolean mShouldShowLottie;
+    private ObjectAnimator mHelpAnimation;
 
     private OrientationEventListener mOrientationEventListener;
     private int mPreviousRotation = 0;
@@ -276,6 +279,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         } else if (mCanAssumeSfps) {
             setContentView(R.layout.sfps_enroll_enrolling);
             setDescriptionText(R.string.security_settings_fingerprint_enroll_start_message);
+            setHelpAnimation();
         } else {
             setContentView(R.layout.fingerprint_enroll_enrolling);
             setDescriptionText(R.string.security_settings_fingerprint_enroll_start_message);
@@ -350,6 +354,17 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         maybeHideSfpsText(config);
     }
 
+    private void setHelpAnimation() {
+        final float translationX = 40;
+        final int duration = 550;
+        final RelativeLayout progressLottieLayout = findViewById(R.id.progress_lottie);
+        mHelpAnimation = ObjectAnimator.ofFloat(progressLottieLayout,
+                "translationX" /* propertyName */,
+                0, translationX, -1 * translationX, translationX, 0f);
+        mHelpAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
+        mHelpAnimation.setDuration(duration);
+        mHelpAnimation.setAutoCancel(false);
+    }
     @Override
     protected BiometricEnrollSidecar getSidecar() {
         final FingerprintEnrollSidecar sidecar = new FingerprintEnrollSidecar(this,
@@ -755,6 +770,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         if (!TextUtils.isEmpty(helpString)) {
             if (!(mCanAssumeUdfps || mCanAssumeSfps)) {
                 mErrorText.removeCallbacks(mTouchAgainRunnable);
+                mErrorText.removeCallbacks(mTouchAgainRunnable);
             }
             showError(helpString);
         }
@@ -848,6 +864,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
             // Show nothing for subtitle when getting an error message.
             setDescriptionText("");
             if (mCanAssumeSfps) {
+                if (!mHelpAnimation.isRunning()) {
+                    mHelpAnimation.start();
+                }
                 applySfpsErrorDynamicColors(getApplicationContext(), true);
             }
         } else {
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index ee6ae223169..9052322f8c3 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -36,6 +36,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
@@ -80,6 +81,8 @@ public class FingerprintEnrollEnrollingTest {
 
     @Mock private LottieAnimationView mIllustrationLottie;
 
+    @Mock private ObjectAnimator mHelpAnimation;
+
     @Mock private FingerprintEnrollSidecar mSidecar;
 
     @Mock private Display mMockDisplay;
@@ -178,6 +181,15 @@ public class FingerprintEnrollEnrollingTest {
         assertThat(observedLottieAssetOrder).isEqualTo(expectedLottieAssetOrder);
     }
 
+    @Test
+    public void fingerprintSfpsEnrollHelpAnimation() {
+        initializeActivityFor(TYPE_POWER_BUTTON);
+        ReflectionHelpers.setField(mActivity, "mHelpAnimation", mHelpAnimation);
+        mActivity.onEnrollmentHelp(0 /* helpMsgId */, "Test help message" /* helpString */);
+
+        verify(mHelpAnimation).start();
+    }
+
     // SFPS_STAGE_CENTER is first stage with progress bar colors, starts at steps=25, remaining=25
     private void configureSfpsStageColorTest() {
         when(mSidecar.getEnrollmentSteps()).thenReturn(25);

From 42ac382af54bbc7bfbdaa7ca65a8c0ad9aeec492 Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Wed, 8 Feb 2023 15:14:41 +0100
Subject: [PATCH 2/2] Add dimensions for notification channel panel

    Removes dependency on output switcher dimens.
    Fix notification settings bottom sheet scroll in landscape.

Test: adb shell cmd notification post "Test notif" &
    adb shell am start -a android.settings.CHANNEL_NOTIFICATION_SETTINGS     --es android.provider.extra.CHANNEL_FILTER_LIST "sound"     --es android.provider.extra.CHANNEL_ID "shell_cmd"     --es android.provider.extra.APP_PACKAGE "com.android.shell"

Bug: 238845213
Change-Id: Iaf4b52b0aa8376c93ebc55fc005cdb55d2a9620e
---
 res/layout/notification_channel_panel.xml | 4 ++--
 res/values-land/dimens.xml                | 2 +-
 res/values/dimens.xml                     | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/layout/notification_channel_panel.xml b/res/layout/notification_channel_panel.xml
index 18e634269b8..fd94707f997 100644
--- a/res/layout/notification_channel_panel.xml
+++ b/res/layout/notification_channel_panel.xml
@@ -16,8 +16,8 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_content"
-    android:layout_height="@dimen/output_switcher_slice_max_height"
-    android:maxHeight="@dimen/output_switcher_slice_max_height"
+    android:layout_height="@dimen/notif_channel_panel_max_height"
+    android:maxHeight="@dimen/notif_channel_panel_max_height"
     android:background="@drawable/settings_panel_background"
     android:orientation="vertical"
     android:layout_width="match_parent">
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index dbf61aca898..fe3e7f610d2 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -32,5 +32,5 @@
     <dimen name="biometric_auth_pattern_view_size">248dp</dimen>
     <dimen name="biometric_auth_pattern_view_max_size">348dp</dimen>
 
-    <dimen name="output_switcher_slice_max_height">300dp</dimen>
+    <dimen name="notif_channel_panel_max_height">300dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f8d3e5013a2..ba98c307869 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -458,6 +458,9 @@
     <dimen name="output_switcher_panel_icon_size">52dp</dimen>
     <dimen name="output_switcher_panel_icon_corner_radius">16dp</dimen>
 
+    <!-- Notification channels panel related dimensions -->
+    <dimen name="notif_channel_panel_max_height">600dp</dimen>
+
     <!-- Settings panel related dimensions -->
     <dimen name="settings_panel_corner_radius">28dp</dimen>
     <dimen name="settings_panel_title_margin">24dp</dimen>