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

Commit 00143545 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Override KeyguardStatusBarView alpha to 0 when bouncer is showing" into main

parents 11fae1bc 4edbaf2c

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.communal.domain.interactor.communalSceneInteractor 
import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.keyguard.domain.interactor.keyguardInteractor

import com.android.systemui.keyguard.ui.viewmodel.glanceableHubToLockscreenTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.lockscreenToGlanceableHubTransitionViewModel

import com.android.systemui.kosmos.Kosmos
@@ -219,6 +220,7 @@ class KeyguardStatusBarViewControllerTest : SysuiTestCase() { 
            kosmos.communalSceneInteractor,

            kosmos.glanceableHubToLockscreenTransitionViewModel,

            kosmos.lockscreenToGlanceableHubTransitionViewModel,

            kosmos.keyguardInteractor,

        )

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java

+12 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.systemui.battery.BatteryMeterViewController; 
import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToLockscreenTransitionViewModel;

import com.android.systemui.keyguard.ui.viewmodel.LockscreenToGlanceableHubTransitionViewModel;

import com.android.systemui.log.core.LogLevel;
@@ -159,6 +160,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
    private final CommunalSceneInteractor mCommunalSceneInteractor;

    private final GlanceableHubToLockscreenTransitionViewModel mHubToLockscreenTransitionViewModel;

    private final LockscreenToGlanceableHubTransitionViewModel mLockscreenToHubTransitionViewModel;

    private final KeyguardInteractor mKeyguardInteractor;



    private ViewGroup mSystemIconsContainer;

    private final StatusOverlayHoverListenerFactory mStatusOverlayHoverListenerFactory;
@@ -364,7 +366,8 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            GlanceableHubToLockscreenTransitionViewModel

                    glanceableHubToLockscreenTransitionViewModel,

            LockscreenToGlanceableHubTransitionViewModel

                    lockscreenToGlanceableHubTransitionViewModel

                    lockscreenToGlanceableHubTransitionViewModel,

            KeyguardInteractor keyguardInteractor

    ) {

        super(view);

        mCoroutineDispatcher = dispatcher;
@@ -397,6 +400,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
        mCommunalSceneInteractor = communalSceneInteractor;

        mHubToLockscreenTransitionViewModel = glanceableHubToLockscreenTransitionViewModel;

        mLockscreenToHubTransitionViewModel = lockscreenToGlanceableHubTransitionViewModel;

        mKeyguardInteractor = keyguardInteractor;



        mFirstBypassAttempt = mKeyguardBypassController.getBypassEnabled();

        mKeyguardStateController.addCallback(
@@ -493,6 +497,9 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            collectFlow(mView, mHubToLockscreenTransitionViewModel.getStatusBarAlpha(),

                    mFromGlanceableHubStatusBarAlphaConsumer, mCoroutineDispatcher);

        }

        if (Flags.bouncerUiRevamp()) {

            collectFlow(mView, mKeyguardInteractor.primaryBouncerShowing, x -> updateViewState());

        }

        if (NewStatusBarIcons.isEnabled()) {

            ComposeView batteryComposeView = createAndBindComposeBattery();
@@ -668,6 +675,10 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            mView.setTranslationX(0);

        }



        if (mKeyguardStateController.isPrimaryBouncerShowing() && Flags.bouncerUiRevamp()) {

            newAlpha = 0.0f;

        }



        boolean hideForBypass =

                mFirstBypassAttempt && mKeyguardUpdateMonitor.shouldListenForFace()

                        || mDelayShowingKeyguardStatusBar;