From 8c1699c6ae9511c79a893d3910ea7eea0eafb150 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Thu, 20 Apr 2023 11:36:22 -0700 Subject: [PATCH 1/2] Update bouncer colors for U. Fixes: 279031011 Test: open up simpin/simpuk/pin in light and dark theme Change-Id: I84a3db273d1e7b5b804cbae367a9d4563df2458d --- .../color/numpad_key_color_secondary.xml | 2 +- .../kg_emergency_button_background.xml | 2 +- .../layout/keyguard_esim_area.xml | 5 ++-- .../keyguard_security_container_view.xml | 5 ++-- .../SystemUI/res-keyguard/values/styles.xml | 2 +- .../res/layout/super_notification_shade.xml | 1 - packages/SystemUI/res/values/dimens.xml | 2 ++ .../keyguard/BouncerKeyguardMessageArea.kt | 6 ++--- .../keyguard/KeyguardSecurityContainer.java | 7 ++++++ .../android/keyguard/KeyguardSimInputView.kt | 7 +++--- .../com/android/keyguard/NumPadAnimator.java | 25 +++++++++++-------- .../com/android/keyguard/NumPadButton.java | 15 ++++++----- .../src/com/android/keyguard/NumPadKey.java | 4 ++- .../android/keyguard/PinShapeHintingView.java | 4 ++- .../keyguard/PinShapeNonHintingView.java | 5 ++-- .../constants/KeyguardBouncerConstants.kt | 11 ++++++++ 16 files changed, 66 insertions(+), 37 deletions(-) diff --git a/packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml b/packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml index 08c66a24348c4..47641ee64ee19 100644 --- a/packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml +++ b/packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml b/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml index 07642736869ca..5e7cf3ee41fb5 100644 --- a/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml +++ b/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml @@ -19,7 +19,7 @@ android:color="?attr/wallpaperTextColorSecondary"> - + diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml index 67fd5b9a78bd4..83736e9d94732 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_esim_area.xml @@ -19,6 +19,7 @@ diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml index 426cfafb190ed..751b07ae9a6ef 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml @@ -19,13 +19,14 @@ @dimen/kg_status_line_font_size