Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1babf69 authored by Chandru S's avatar Chandru S
Browse files

Make the bouncer background transparent 

Flag: com.android.systemui.bouncer_ui_revamp
Bug: 370555003
Test: verified manually, scrim's opacity now controls how much of the background surface is visible
Change-Id: I54c66453a09e3180eecf40c5c70b5b0a614f2b48
parent 5ce77909

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+15 −4
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.content.res.Resources; 
import android.graphics.Bitmap;

import android.graphics.BlendMode;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Rect;

import android.graphics.Typeface;

import android.graphics.drawable.BitmapDrawable;
@@ -97,6 +98,7 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.settingslib.Utils;

import com.android.settingslib.drawable.CircleFramedDrawable;

import com.android.systemui.Flags;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.classifier.FalsingA11yDelegate;

import com.android.systemui.plugins.FalsingManager;
@@ -346,8 +348,7 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
        setPadding(getPaddingLeft(), getPaddingTop() + getResources().getDimensionPixelSize(

                        R.dimen.keyguard_security_container_padding_top), getPaddingRight(),

                getPaddingBottom());

        setBackgroundColor(

                getContext().getColor(com.android.internal.R.color.materialColorSurfaceDim));

        reloadBackgroundColor();

    }



    void onResume(SecurityMode securityMode, boolean faceAuthEnabled) {
@@ -812,10 +813,20 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
        mDisappearAnimRunning = false;

    }



    private void reloadBackgroundColor() {

        if (Flags.bouncerUiRevamp()) {

            // Keep the background transparent, otherwise the background color looks like a box

            // while scaling the bouncer for back animation or while transitioning to the bouncer.

            setBackgroundColor(Color.TRANSPARENT);

        } else {

            setBackgroundColor(

                    getContext().getColor(com.android.internal.R.color.materialColorSurfaceDim));

        }

    }



    void reloadColors() {

        mViewMode.reloadColors();

        setBackgroundColor(getContext().getColor(

                com.android.internal.R.color.materialColorSurfaceDim));

        reloadBackgroundColor();

    }



    /** Handles density or font scale changes. */