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

Commit 34e464f8 authored by Justin Weir's avatar Justin Weir
Browse files

Begin deleting ShadeExpansionStateManager.addFullExpansionListener 

Bug: 300243163
Test: updated existing tests
Test: manually verified equivalent logs in old and new callbacks
Change-Id: I1db43a550134d169142205a4687aef774c77cf15
parent 2263796c

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+11 −9
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ import com.android.keyguard.dagger.KeyguardUserSwitcherComponent; 
import com.android.systemui.DejankUtils;

import com.android.systemui.Dumpable;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.res.R;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.animation.LaunchAnimator;

import com.android.systemui.biometrics.AuthController;
@@ -163,6 +162,7 @@ import com.android.systemui.plugins.FalsingManager.FalsingTapListener; 
import com.android.systemui.plugins.qs.QS;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;

import com.android.systemui.res.R;

import com.android.systemui.shade.data.repository.ShadeRepository;

import com.android.systemui.shade.transition.ShadeTransitionController;

import com.android.systemui.shared.system.QuickStepContract;
@@ -393,7 +393,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private TrackingStartedListener mTrackingStartedListener;

    private OpenCloseListener mOpenCloseListener;

    private GestureRecorder mGestureRecorder;

    private boolean mPanelExpanded;



    private boolean mKeyguardQsUserSwitchEnabled;

    private boolean mKeyguardUserSwitcherEnabled;
@@ -1321,7 +1320,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


        // when we switch between split shade and regular shade we want to enforce setting qs to

        // the default state: expanded for split shade and collapsed otherwise

        if (!isKeyguardShowing() && mPanelExpanded) {

        if (!isKeyguardShowing() && isPanelExpanded()) {

            mQsController.setExpanded(mSplitShadeEnabled);

        }

        if (isKeyguardShowing() && mQsController.getExpanded() && mSplitShadeEnabled) {
@@ -2630,10 +2629,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


    private void updatePanelExpanded() {

        boolean isExpanded = !isFullyCollapsed() || mExpectingSynthesizedDown;

        if (mPanelExpanded != isExpanded) {

            mPanelExpanded = isExpanded;

        if (isPanelExpanded() != isExpanded) {

            setExpandedOrAwaitingInputTransfer(isExpanded);

            updateSystemUiStateFlags();

            mShadeRepository.setLegacyExpandedOrAwaitingInputTransfer(mPanelExpanded);

            mShadeExpansionStateManager.onShadeExpansionFullyChanged(isExpanded);

            if (!isExpanded) {

                mQsController.closeQsCustomizer();
@@ -2641,9 +2639,13 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        }

    }



    private void setExpandedOrAwaitingInputTransfer(boolean expandedOrAwaitingInputTransfer) {

        mShadeRepository.setLegacyExpandedOrAwaitingInputTransfer(expandedOrAwaitingInputTransfer);

    }



    @Override

    public boolean isPanelExpanded() {

        return mPanelExpanded;

        return mShadeRepository.getLegacyExpandedOrAwaitingInputTransfer().getValue();

    }



    private int calculatePanelHeightShade() {
@@ -3392,7 +3394,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        ipw.print("mMaxAllowedKeyguardNotifications=");

        ipw.println(mMaxAllowedKeyguardNotifications);

        ipw.print("mAnimateNextPositionUpdate="); ipw.println(mAnimateNextPositionUpdate);

        ipw.print("mPanelExpanded="); ipw.println(mPanelExpanded);

        ipw.print("isPanelExpanded()="); ipw.println(isPanelExpanded());

        ipw.print("mKeyguardQsUserSwitchEnabled="); ipw.println(mKeyguardQsUserSwitchEnabled);

        ipw.print("mKeyguardUserSwitcherEnabled="); ipw.println(mKeyguardUserSwitcherEnabled);

        ipw.print("mDozing="); ipw.println(mDozing);
@@ -3606,7 +3608,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                    + isFullyExpanded() + " inQs=" + mQsController.getExpanded());

        }

        mSysUiState

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, mPanelExpanded)

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE, isPanelExpanded())

                .setFlag(SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED,

                        isFullyExpanded() && !mQsController.getExpanded())

                .setFlag(SYSUI_STATE_QUICK_SETTINGS_EXPANDED,

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+21 −10
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONT 
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OPTIMIZE_MEASURE;



import static com.android.systemui.statusbar.NotificationRemoteInputManager.ENABLE_REMOTE_INPUT;

import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;



import android.app.IActivityManager;

import android.content.Context;
@@ -48,7 +49,6 @@ import android.view.WindowManagerGlobal; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.Dumpable;

import com.android.systemui.res.R;

import com.android.systemui.biometrics.AuthController;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dagger.SysUISingleton;
@@ -58,7 +58,9 @@ import com.android.systemui.dump.DumpsysTableLogger; 
import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;

import com.android.systemui.res.R;

import com.android.systemui.scene.ui.view.WindowRootViewComponent;

import com.android.systemui.shade.domain.interactor.ShadeInteractor;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;
@@ -71,6 +73,8 @@ import com.android.systemui.statusbar.policy.ConfigurationController; 
import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;

import com.android.systemui.statusbar.policy.KeyguardStateController;



import dagger.Lazy;



import java.io.PrintWriter;

import java.lang.ref.Reference;

import java.lang.ref.WeakReference;
@@ -108,6 +112,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    private final KeyguardBypassController mKeyguardBypassController;

    private final Executor mBackgroundExecutor;

    private final AuthController mAuthController;

    private final Lazy<ShadeInteractor> mShadeInteractorLazy;

    private ViewGroup mWindowRootView;

    private LayoutParams mLp;

    private boolean mHasTopUi;
@@ -151,6 +156,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
            ScreenOffAnimationController screenOffAnimationController,

            AuthController authController,

            ShadeExpansionStateManager shadeExpansionStateManager,

            Lazy<ShadeInteractor> shadeInteractorLazy,

            ShadeWindowLogger logger) {

        mContext = context;

        mWindowRootViewComponentFactory = windowRootViewComponentFactory;
@@ -171,12 +177,12 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
        mLastKeyguardRotationAllowed = mKeyguardStateController.isKeyguardScreenRotationAllowed();

        mLockScreenDisplayTimeout = context.getResources()

                .getInteger(R.integer.config_lockScreenDisplayTimeout);

        mShadeInteractorLazy = shadeInteractorLazy;

        ((SysuiStatusBarStateController) statusBarStateController)

                .addCallback(mStateListener,

                        SysuiStatusBarStateController.RANK_STATUS_BAR_WINDOW_CONTROLLER);

        configurationController.addCallback(this);

        shadeExpansionStateManager.addQsExpansionListener(this::onQsExpansionChanged);

        shadeExpansionStateManager.addFullExpansionListener(this::onShadeExpansionFullyChanged);



        float desiredPreferredRefreshRate = context.getResources()

                .getInteger(R.integer.config_keyguardRefreshRate);
@@ -224,9 +230,9 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    }



    @VisibleForTesting

    void onShadeExpansionFullyChanged(Boolean isExpanded) {

        if (mCurrentState.panelExpanded != isExpanded) {

            mCurrentState.panelExpanded = isExpanded;

    void onShadeOrQsExpanded(Boolean isExpanded) {

        if (mCurrentState.shadeOrQsExpanded != isExpanded) {

            mCurrentState.shadeOrQsExpanded = isExpanded;

            apply(mCurrentState);

        }

    }
@@ -289,6 +295,11 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    public void fetchWindowRootView() {

        WindowRootViewComponent component = mWindowRootViewComponentFactory.create();

        mWindowRootView = component.getWindowRootView();

        collectFlow(

                mWindowRootView,

                mShadeInteractorLazy.get().isAnyExpanded(),

                this::onShadeOrQsExpanded

        );

    }



    @Override
@@ -384,7 +395,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    }



    private void applyFocusableFlag(NotificationShadeWindowState state) {

        boolean panelFocusable = state.notificationShadeFocusable && state.panelExpanded;

        boolean panelFocusable = state.notificationShadeFocusable && state.shadeOrQsExpanded;

        if (state.bouncerShowing && (state.keyguardOccluded || state.keyguardNeedsInput)

                || ENABLE_REMOTE_INPUT && state.remoteInputActive

                // Make the panel focusable if we're doing the screen off animation, since the light
@@ -408,7 +419,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    }



    private void applyForceShowNavigationFlag(NotificationShadeWindowState state) {

        if (state.panelExpanded || state.bouncerShowing

        if (state.shadeOrQsExpanded || state.bouncerShowing

                || ENABLE_REMOTE_INPUT && state.remoteInputActive) {

            mLpChanged.forciblyShownTypes |= WindowInsets.Type.navigationBars();

        } else {
@@ -544,7 +555,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
                state.keyguardOccluded,

                state.keyguardNeedsInput,

                state.panelVisible,

                state.panelExpanded,

                state.shadeOrQsExpanded,

                state.notificationShadeFocusable,

                state.bouncerShowing,

                state.keyguardFadingAway,
@@ -582,7 +593,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
                    mCurrentState.keyguardGoingAway,

                    mCurrentState.bouncerShowing,

                    mCurrentState.dozing,

                    mCurrentState.panelExpanded,

                    mCurrentState.shadeOrQsExpanded,

                    mCurrentState.dreaming);

        }

    }
@@ -833,7 +844,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
     */

    @Override

    public boolean getPanelExpanded() {

        return mCurrentState.panelExpanded;

        return mCurrentState.shadeOrQsExpanded;

    }



    @Override

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowState.kt

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class NotificationShadeWindowState( 
    @JvmField var keyguardNeedsInput: Boolean = false,

    @JvmField var panelVisible: Boolean = false,

    /** shade panel is expanded (expansion fraction > 0) */

    @JvmField var panelExpanded: Boolean = false,

    @JvmField var shadeOrQsExpanded: Boolean = false,

    @JvmField var notificationShadeFocusable: Boolean = false,

    @JvmField var bouncerShowing: Boolean = false,

    @JvmField var keyguardFadingAway: Boolean = false,
@@ -70,7 +70,7 @@ class NotificationShadeWindowState( 
            keyguardOccluded.toString(),

            keyguardNeedsInput.toString(),

            panelVisible.toString(),

            panelExpanded.toString(),

            shadeOrQsExpanded.toString(),

            notificationShadeFocusable.toString(),

            bouncerShowing.toString(),

            keyguardFadingAway.toString(),
@@ -137,7 +137,7 @@ class NotificationShadeWindowState( 
                this.keyguardOccluded = keyguardOccluded

                this.keyguardNeedsInput = keyguardNeedsInput

                this.panelVisible = panelVisible

                this.panelExpanded = panelExpanded

                this.shadeOrQsExpanded = panelExpanded

                this.notificationShadeFocusable = notificationShadeFocusable

                this.bouncerShowing = bouncerShowing

                this.keyguardFadingAway = keyguardFadingAway

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ import com.android.systemui.shade.NotificationShadeWindowControllerImpl; 
import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shade.ShadeWindowLogger;

import com.android.systemui.shade.domain.interactor.ShadeInteractor;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;
@@ -185,6 +186,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
    private @Mock SysuiColorExtractor mColorExtractor;

    private @Mock AuthController mAuthController;

    private @Mock ShadeExpansionStateManager mShadeExpansionStateManager;

    private @Mock ShadeInteractor mShadeInteractor;

    private @Mock ShadeWindowLogger mShadeWindowLogger;

    private @Captor ArgumentCaptor<KeyguardStateController.Callback>

            mKeyguardStateControllerCallback;
@@ -249,6 +251,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
                mScreenOffAnimationController,

                mAuthController,

                mShadeExpansionStateManager,

                () -> mShadeInteractor,

                mShadeWindowLogger);

        mFeatureFlags = new FakeFeatureFlags();

        mFeatureFlags.set(Flags.KEYGUARD_WM_STATE_REFACTOR, false);

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java

+40 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.spy;
@@ -46,22 +47,34 @@ import android.view.WindowManager; 
import androidx.test.filters.SmallTest;



import com.android.internal.colorextraction.ColorExtractor;

import com.android.systemui.res.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.biometrics.AuthController;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.res.R;

import com.android.systemui.scene.FakeWindowRootViewComponent;

import com.android.systemui.scene.SceneTestUtils;

import com.android.systemui.scene.shared.flag.FakeSceneContainerFlags;

import com.android.systemui.shade.data.repository.FakeShadeRepository;

import com.android.systemui.shade.domain.interactor.ShadeInteractor;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.disableflags.data.repository.FakeDisableFlagsRepository;

import com.android.systemui.statusbar.notification.stack.domain.interactor.SharedNotificationContainerInteractor;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.ScreenOffAnimationController;

import com.android.systemui.statusbar.phone.ScrimController;

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeUserSetupRepository;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController;

import com.android.systemui.user.domain.interactor.UserInteractor;



import com.google.common.util.concurrent.MoreExecutors;
@@ -77,8 +90,10 @@ import org.mockito.Spy; 
import java.util.List;

import java.util.concurrent.Executor;



import kotlinx.coroutines.test.TestScope;



@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@RunWithLooper(setAsMainLooper = true)

@SmallTest

public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
@@ -102,6 +117,9 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
    @Captor private ArgumentCaptor<WindowManager.LayoutParams> mLayoutParameters;

    @Captor private ArgumentCaptor<StatusBarStateController.StateListener> mStateListener;

    private final Executor mBackgroundExecutor = MoreExecutors.directExecutor();

    private SceneTestUtils mUtils = new SceneTestUtils(this);

    private TestScope mTestScope = mUtils.getTestScope();

    private ShadeInteractor mShadeInteractor;



    private NotificationShadeWindowControllerImpl mNotificationShadeWindowController;

    private float mPreferredRefreshRate = -1;
@@ -119,6 +137,23 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
        when(mDozeParameters.getAlwaysOn()).thenReturn(true);

        when(mColorExtractor.getNeutralColors()).thenReturn(mGradientColors);



        mShadeInteractor =

                new ShadeInteractor(

                        mTestScope.getBackgroundScope(),

                        new FakeDisableFlagsRepository(),

                        new FakeSceneContainerFlags(),

                        mUtils::sceneInteractor,

                        new FakeKeyguardRepository(),

                        new FakeUserSetupRepository(),

                        mock(DeviceProvisionedController.class),

                        mock(UserInteractor.class),

                        new SharedNotificationContainerInteractor(

                                new FakeConfigurationRepository(),

                                mContext,

                                new ResourcesSplitShadeStateController()),

                        new FakeShadeRepository()

                );



        mNotificationShadeWindowController = new NotificationShadeWindowControllerImpl(

                mContext,

                new FakeWindowRootViewComponent.Factory(mNotificationShadeWindowView),
@@ -136,6 +171,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
                mScreenOffAnimationController,

                mAuthController,

                mShadeExpansionStateManager,

                () -> mShadeInteractor,

                mShadeWindowLogger) {

                    @Override

                    protected boolean isDebuggable() {
@@ -272,9 +308,9 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 


    @Test

    public void setPanelExpanded_notFocusable_altFocusable_whenPanelIsOpen() {

        mNotificationShadeWindowController.onShadeExpansionFullyChanged(true);

        mNotificationShadeWindowController.onShadeOrQsExpanded(true);

        clearInvocations(mWindowManager);

        mNotificationShadeWindowController.onShadeExpansionFullyChanged(true);

        mNotificationShadeWindowController.onShadeOrQsExpanded(true);

        verifyNoMoreInteractions(mWindowManager);

        mNotificationShadeWindowController.setNotificationShadeFocusable(true);