From 1fa3fa1007e70e9b0bdc1caf0fc5b817dbaa57fa Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Thu, 14 Mar 2024 10:44:13 -0700 Subject: Make bouncer background opaque We keep seeing the bouncer showing over LS content with no scrim showing. We cannot continue to rely on the scrim as there has historically been problems with it being in the right state. The material surface background was removed from the bouncer due to a weird gray after image when unlocking. This seems to have been fixed because the bouncer background and backscrim color are the same color (material surface). CL for reference: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/24034687 Test: unlock device and observe unlock animation. Test: swipe down for shade transition and then swipe up immediately. Test: observe bouncer background is opaque in web-hv Fixes: 328224320 Fixes: 328548367 Flag: NONE Change-Id: Ie94195fc65add09faaad4e6c3270e9f05a420e08 (cherry picked from commit 6471f0a7255b6ca095fc879cc5894f16383f67d8) --- .../SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index 05eeac6fc199..70465bc3d0b7 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -343,6 +343,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout { setPadding(getPaddingLeft(), getPaddingTop() + getResources().getDimensionPixelSize( R.dimen.keyguard_security_container_padding_top), getPaddingRight(), getPaddingBottom()); + setBackgroundColor(Utils.getColorAttrDefaultColor(getContext(), + com.android.internal.R.attr.materialColorSurface)); } void onResume(SecurityMode securityMode, boolean faceAuthEnabled) { @@ -800,6 +802,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout { void reloadColors() { mViewMode.reloadColors(); + setBackgroundColor(Utils.getColorAttrDefaultColor(getContext(), + com.android.internal.R.attr.materialColorSurface)); } /** Handles density or font scale changes. */ -- cgit v1.2.3-59-g8ed1b