From 230dcab138f069b89215161ce368b124f8bbe8ee Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Thu, 1 Dec 2022 12:17:21 -0800
Subject: [PATCH] [Bouncer] Fix some responsiveness issues.

Found a couple of responsive issues and fixing them.

1. Numpad key digits had a min size of 32 sp. This would look off when
   we maximize the display size and go into half folded on a foldable
   device. I set the text to autosize with a max size of 32sp.
2. Userswitcher anchor was squished in password security method on
   tablet. I removed some clipping in order to fix this.

Fixes: 261062809
Test: Open password view with max display and normal display sizes for
tablet.
Test: Half fold on foldable for pin view in bouncer.

Change-Id: I78fbbb231c35118bef65660b7ca5562d77dad16b
---
 .../res-keyguard/layout/keyguard_bouncer_user_switcher.xml     | 2 --
 packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml | 2 ++
 .../src/com/android/keyguard/KeyguardSecurityContainer.java    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml
index 898935fc7e993..2cac9c706fe90 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml
@@ -21,8 +21,6 @@
     android:id="@+id/keyguard_bouncer_user_switcher"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clipChildren="false"
-    android:clipToPadding="false"
     android:orientation="vertical"
     android:gravity="center"
     android:importantForAccessibility="yes"> <!-- Needed because TYPE_WINDOW_STATE_CHANGED is sent
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml b/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml
index 411fea5dd22de..316ad39a9f05a 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml
@@ -18,6 +18,8 @@
     <TextView
         android:id="@+id/digit_text"
         style="@style/Widget.TextView.NumPadKey.Digit"
+        android:autoSizeMaxTextSize="32sp"
+        android:autoSizeTextType="uniform"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         />
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index 5c4126eeb93ab..8f3484a0c99b8 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -221,10 +221,11 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
                 public void onEnd(WindowInsetsAnimation animation) {
                     if (!mDisappearAnimRunning) {
                         endJankInstrument(InteractionJankMonitor.CUJ_LOCKSCREEN_PASSWORD_APPEAR);
-                        updateChildren(0 /* translationY */, 1f /* alpha */);
                     } else {
                         endJankInstrument(InteractionJankMonitor.CUJ_LOCKSCREEN_PASSWORD_DISAPPEAR);
+                        setAlpha(0f);
                     }
+                    updateChildren(0 /* translationY */, 1f /* alpha */);
                 }
 
                 private void updateChildren(int translationY, float alpha) {