diff options
| author | Nancy Wu <nancyscwu@google.com> | 2023-02-10 09:04:18 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-10 09:22:38 +0000 |
| commit | f7b3c0aab4f058dbd2c588387cf47b2d60933cea (patch) | |
| tree | bbbcaaa8b395652d26b99a523eaab3483e5ba1c5 | |
| parent | dbdce2174f359fbc3a08801e9ca4242904425b80 (diff) | |
| download | base-f7b3c0aab4f058dbd2c588387cf47b2d60933cea.tar.gz | |
Revert "[Bouncer] Fix some responsiveness issues."
This reverts commit f4837869e7997e0cd12ee4ab612c7d75e4b3c500.
Reason for revert: suspect b/268591932 culprit
Change-Id: I0e66506ece75eee97a5c0b21a4e2517101e453ca
(cherry picked from commit c5ad66601a8b15d289ff1d2603efdce35d3dabd2)
Merged-In: I0e66506ece75eee97a5c0b21a4e2517101e453ca
3 files changed, 3 insertions, 4 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 2cac9c706fe9..898935fc7e99 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_bouncer_user_switcher.xml @@ -21,6 +21,8 @@ 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 316ad39a9f05..411fea5dd22d 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml @@ -18,8 +18,6 @@ <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 8f3484a0c99b..5c4126eeb93a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -221,11 +221,10 @@ 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) { |