From 2e8db7df9157e5875f933c6e847b58ee20ea457e Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Thu, 23 Feb 2023 12:26:41 -0800 Subject: [PATCH] Make sim pin views more responsive Port over the constraint layout logic from the pin view to the sim pin and sim puk view. I also reduced the sim icon to be a static 40x40 dp and added a top margin to the password text view. Also add some refinements to numpad jank. Firstly, ensure that we set the corner radius correctly upon every layout. Secondly, re-enable auto resize. There was an issue with this api (b/261552438) but this shouldn't be an issue anymore because we are resetting the bouncer view everytime upon show. Fixes: 257213890 Test: open sim pin and sim puk view from foldable device. Instead of adding an esim, which isn't possible on my device, I hard coded the logic for the view to show up. I tested on various orientations and display sizes. Test: open/close bouncer a bunch of times and change orientation a bunch of times on foldable. Change-Id: I56966ea64e03155b05db9e7f5886f14ac127949f --- .../drawable-mdpi/ic_lockscreen_sim.png | Bin 2602 -> 0 bytes .../drawable-xhdpi/ic_lockscreen_sim.png | Bin 5201 -> 0 bytes .../ic_lockscreen_sim.png | Bin .../layout/keyguard_num_pad_key.xml | 4 +- .../layout/keyguard_sim_pin_view.xml | 341 +++++++++--------- .../layout/keyguard_sim_puk_view.xml | 297 ++++++++------- .../com/android/keyguard/NumPadAnimator.java | 5 +- 7 files changed, 320 insertions(+), 327 deletions(-) delete mode 100644 packages/SystemUI/res-keyguard/drawable-mdpi/ic_lockscreen_sim.png delete mode 100644 packages/SystemUI/res-keyguard/drawable-xhdpi/ic_lockscreen_sim.png rename packages/SystemUI/res-keyguard/{drawable-hdpi => drawable}/ic_lockscreen_sim.png (100%) diff --git a/packages/SystemUI/res-keyguard/drawable-mdpi/ic_lockscreen_sim.png b/packages/SystemUI/res-keyguard/drawable-mdpi/ic_lockscreen_sim.png deleted file mode 100644 index 2e259c3e17c17b8627cc2159aee5d09df98b73fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2602 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 - + diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml index 7db0fe908ec05..728d861ab6939 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml @@ -1,5 +1,4 @@ - - - + + + - - - - + - - + android:gravity="center_horizontal" + android:paddingTop="@dimen/num_pad_entry_row_margin_bottom" + android:paddingBottom="@dimen/num_pad_entry_row_margin_bottom" + androidprv:layout_constraintBottom_toTopOf="@+id/flow1" + androidprv:layout_constraintEnd_toEndOf="parent" + androidprv:layout_constraintStart_toStartOf="parent" + androidprv:layout_constraintTop_toTopOf="parent"> + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml index 422bd4c12e8ee..7e24d1231aee9 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml @@ -21,6 +21,7 @@ - - - - - + - + android:gravity="center_horizontal" + android:paddingTop="@dimen/num_pad_entry_row_margin_bottom" + android:paddingBottom="@dimen/num_pad_entry_row_margin_bottom" + androidprv:layout_constraintBottom_toTopOf="@+id/flow1" + androidprv:layout_constraintEnd_toEndOf="parent" + androidprv:layout_constraintStart_toStartOf="parent" + androidprv:layout_constraintTop_toTopOf="parent"> - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +