diff options
| author | 2022-12-05 15:50:52 +0000 | |
|---|---|---|
| committer | 2022-12-05 15:50:52 +0000 | |
| commit | 45ffc6b6283fec66b13d15bfd5c63aa203036c2c (patch) | |
| tree | 919036ef3164c7211aae19c65878c22eb7771787 | |
| parent | 11d45a263c50e0d4782225aba904f0d3d96d290d (diff) | |
| parent | f4aeb69e693dbf4a580fbc8becc4c0114a376ba9 (diff) | |
Merge "[Bouncer] Fix some responsiveness issues." into tm-qpr-dev am: 74eae242c0 am: f4aeb69e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20612038
Change-Id: Ic738ef5b165d8aac723766a625072f7efe861a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 898935fc7e99..2cac9c706fe9 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 411fea5dd22d..316ad39a9f05 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 5c4126eeb93a..8f3484a0c99b 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) { |