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

Commit f82b10e9 authored by Justin Weir's avatar Justin Weir
Browse files

Inject NPVC into ShadeControllerImpl 

Now that NPVC is a singleton, it can be injected into SC instead
of being passed in by CentralSurfaces. Since NPVC must be injected
lazily into SC to avoid updating most classes that inject SC,
the NPVC setup code in SC must be moved to a CoreStartable. This
causes some Dagger issues for TV that required additional changes.
This change also creates an empty impl of SC to be used by Android
variants that don't have a shade, allowing us to make changes to
the SC interface without a Gerrit topic.

Fixes: 237661616
Fixes: 288867586
Test: manual, atest, and presubmits
Change-Id: Ia58178b37f3179ff10ac7476f78394e7874e790b
Merged-In: Ia58178b37f3179ff10ac7476f78394e7874e790b
parent b72062c6

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSysUIComponent.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.dagger; 


import com.android.systemui.globalactions.ShutdownUiModule;

import com.android.systemui.keyguard.CustomizationProvider;

import com.android.systemui.shade.ShadeModule;

import com.android.systemui.statusbar.NotificationInsetsModule;

import com.android.systemui.statusbar.QsFrameTranslateModule;
@@ -32,6 +33,7 @@ import dagger.Subcomponent; 
        DependencyProvider.class,

        NotificationInsetsModule.class,

        QsFrameTranslateModule.class,

        ShadeModule.class,

        ShutdownUiModule.class,

        SystemUIBinder.class,

        SystemUIModule.class,

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+0 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ import com.android.systemui.screenshot.dagger.ScreenshotModule; 
import com.android.systemui.security.data.repository.SecurityRepositoryModule;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeModule;

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

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

import com.android.systemui.shared.condition.Monitor;
@@ -199,7 +198,6 @@ import javax.inject.Named; 
            SecurityRepositoryModule.class,

            ScreenRecordModule.class,

            SettingsUtilModule.class,

            ShadeModule.class,

            SmartRepliesInflationModule.class,

            SmartspaceModule.class,

            StatusBarPipelineModule.class,

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

+5 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.shade; 


import android.view.MotionEvent;



import com.android.systemui.CoreStartable;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.StatusBarState;
@@ -31,7 +32,7 @@ import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; 
 * these are coordinated with {@link StatusBarKeyguardViewManager} via

 * {@link com.android.systemui.keyguard.KeyguardViewMediator} and others.

 */

public interface ShadeController {

public interface ShadeController extends CoreStartable {



    /** Make our window larger and the shade expanded */

    void instantExpandShade();
@@ -164,17 +165,14 @@ public interface ShadeController { 
    void onLaunchAnimationEnd(boolean launchIsFullScreen);



    /** Sets the listener for when the visibility of the shade changes. */

    default void setVisibilityListener(ShadeVisibilityListener listener) {};

    default void setVisibilityListener(ShadeVisibilityListener listener) {}



    /** */

    default void setNotificationPresenter(NotificationPresenter presenter) {};

    default void setNotificationPresenter(NotificationPresenter presenter) {}



    /** */

    default void setNotificationShadeWindowViewController(

            NotificationShadeWindowViewController notificationShadeWindowViewController) {};



    /** */

    default void setShadeViewController(ShadeViewController shadeViewController) {};

            NotificationShadeWindowViewController notificationShadeWindowViewController) {}



    /** Listens for shade visibility changes. */

    interface ShadeVisibilityListener {

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

+17 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.shade



import android.view.MotionEvent
@@ -7,6 +23,7 @@ import javax.inject.Inject 
/** Empty implementation of ShadeController for variants of Android without shades. */

@SysUISingleton

open class ShadeControllerEmptyImpl @Inject constructor() : ShadeController {

    override fun start() {}

    override fun instantExpandShade() {}

    override fun instantCollapseShade() {}

    override fun animateCollapseShade(

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

+27 −23
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public final class ShadeControllerImpl implements ShadeController { 
    private final StatusBarWindowController mStatusBarWindowController;

    private final DeviceProvisionedController mDeviceProvisionedController;



    private final Lazy<ShadeViewController> mShadeViewControllerLazy;

    private final Lazy<AssistManager> mAssistManagerLazy;

    private final Lazy<NotificationGutsManager> mGutsManager;
@@ -70,8 +71,6 @@ public final class ShadeControllerImpl implements ShadeController { 


    private boolean mExpandedVisible;



    // TODO(b/237661616): Rename this variable to mShadeViewController.

    private ShadeViewController mNotificationPanelViewController;

    private NotificationPresenter mPresenter;

    private NotificationShadeWindowViewController mNotificationShadeWindowViewController;

    private ShadeVisibilityListener mShadeVisibilityListener;
@@ -87,11 +86,13 @@ public final class ShadeControllerImpl implements ShadeController { 
            DeviceProvisionedController deviceProvisionedController,

            NotificationShadeWindowController notificationShadeWindowController,

            WindowManager windowManager,

            Lazy<ShadeViewController> shadeViewControllerLazy,

            Lazy<AssistManager> assistManagerLazy,

            Lazy<NotificationGutsManager> gutsManager

    ) {

        mCommandQueue = commandQueue;

        mMainExecutor = mainExecutor;

        mShadeViewControllerLazy = shadeViewControllerLazy;

        mStatusBarStateController = statusBarStateController;

        mStatusBarWindowController = statusBarWindowController;

        mDeviceProvisionedController = deviceProvisionedController;
@@ -107,7 +108,7 @@ public final class ShadeControllerImpl implements ShadeController { 
    public void instantExpandShade() {

        // Make our window larger and the panel expanded.

        makeExpandedVisible(true /* force */);

        mNotificationPanelViewController.expand(false /* animate */);

        getShadeViewController().expand(false /* animate */);

        mCommandQueue.recomputeDisableFlags(mDisplayId, false /* animate */);

    }
@@ -123,13 +124,13 @@ public final class ShadeControllerImpl implements ShadeController { 
                    "animateCollapse(): mExpandedVisible=" + mExpandedVisible + "flags=" + flags);

        }

        if (getNotificationShadeWindowView() != null

                && mNotificationPanelViewController.canBeCollapsed()

                && getShadeViewController().canBeCollapsed()

                && (flags & CommandQueue.FLAG_EXCLUDE_NOTIFICATION_PANEL) == 0) {

            // release focus immediately to kick off focus change transition

            mNotificationShadeWindowController.setNotificationShadeFocusable(false);



            mNotificationShadeWindowViewController.cancelExpandHelper();

            mNotificationPanelViewController.collapse(true, delayed, speedUpFactor);

            getShadeViewController().collapse(true, delayed, speedUpFactor);

        }

    }
@@ -138,7 +139,7 @@ public final class ShadeControllerImpl implements ShadeController { 
        if (!mCommandQueue.panelsEnabled()) {

            return;

        }

        mNotificationPanelViewController.expandToNotifications();

        getShadeViewController().expandToNotifications();

    }



    @Override
@@ -149,12 +150,12 @@ public final class ShadeControllerImpl implements ShadeController { 
        // Settings are not available in setup

        if (!mDeviceProvisionedController.isCurrentUserSetup()) return;



        mNotificationPanelViewController.expandToQs();

        getShadeViewController().expandToQs();

    }



    @Override

    public boolean closeShadeIfOpen() {

        if (!mNotificationPanelViewController.isFullyCollapsed()) {

        if (!getShadeViewController().isFullyCollapsed()) {

            mCommandQueue.animateCollapsePanels(

                    CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */);

            notifyVisibilityChanged(false);
@@ -170,12 +171,12 @@ public final class ShadeControllerImpl implements ShadeController { 


    @Override

    public boolean isShadeFullyOpen() {

        return mNotificationPanelViewController.isShadeFullyExpanded();

        return getShadeViewController().isShadeFullyExpanded();

    }



    @Override

    public boolean isExpandingOrCollapsing() {

        return mNotificationPanelViewController.isExpandingOrCollapsing();

        return getShadeViewController().isExpandingOrCollapsing();

    }

    @Override

    public void postAnimateCollapseShade() {
@@ -194,13 +195,13 @@ public final class ShadeControllerImpl implements ShadeController { 


    @Override

    public void postOnShadeExpanded(Runnable executable) {

        mNotificationPanelViewController.addOnGlobalLayoutListener(

        getShadeViewController().addOnGlobalLayoutListener(

                new ViewTreeObserver.OnGlobalLayoutListener() {

                    @Override

                    public void onGlobalLayout() {

                        if (getNotificationShadeWindowView().isVisibleToUser()) {

                            mNotificationPanelViewController.removeOnGlobalLayoutListener(this);

                            mNotificationPanelViewController.postToView(executable);

                            getShadeViewController().removeOnGlobalLayoutListener(this);

                            getShadeViewController().postToView(executable);

                        }

                    }

                });
@@ -224,7 +225,7 @@ public final class ShadeControllerImpl implements ShadeController { 


    @Override

    public boolean collapseShade() {

        if (!mNotificationPanelViewController.isFullyCollapsed()) {

        if (!getShadeViewController().isFullyCollapsed()) {

            // close the shade if it was open

            animateCollapseShadeForcedDelayed();

            notifyVisibilityChanged(false);
@@ -252,10 +253,10 @@ public final class ShadeControllerImpl implements ShadeController { 


    @Override

    public void cancelExpansionAndCollapseShade() {

        if (mNotificationPanelViewController.isTracking()) {

        if (getShadeViewController().isTracking()) {

            mNotificationShadeWindowViewController.cancelCurrentTouch();

        }

        if (mNotificationPanelViewController.isPanelExpanded()

        if (getShadeViewController().isPanelExpanded()

                && mStatusBarStateController.getState() == StatusBarState.SHADE) {

            animateCollapseShade();

        }
@@ -311,7 +312,7 @@ public final class ShadeControllerImpl implements ShadeController { 


    @Override

    public void instantCollapseShade() {

        mNotificationPanelViewController.instantCollapse();

        getShadeViewController().instantCollapse();

        runPostCollapseRunnables();

    }
@@ -342,7 +343,7 @@ public final class ShadeControllerImpl implements ShadeController { 
        }



        // Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868)

        mNotificationPanelViewController.collapse(false, false, 1.0f);

        getShadeViewController().collapse(false, false, 1.0f);



        mExpandedVisible = false;

        notifyVisibilityChanged(false);
@@ -364,7 +365,7 @@ public final class ShadeControllerImpl implements ShadeController { 
        notifyExpandedVisibleChanged(false);

        mCommandQueue.recomputeDisableFlags(

                mDisplayId,

                mNotificationPanelViewController.shouldHideStatusBarIconsWhenExpanded());

                getShadeViewController().shouldHideStatusBarIconsWhenExpanded());



        // Trimming will happen later if Keyguard is showing - doing it here might cause a jank in

        // the bouncer appear animation.
@@ -406,11 +407,14 @@ public final class ShadeControllerImpl implements ShadeController { 
        return mNotificationShadeWindowViewController.getView();

    }



    private ShadeViewController getShadeViewController() {

        return mShadeViewControllerLazy.get();

    }



    @Override

    public void setShadeViewController(ShadeViewController shadeViewController) {

        mNotificationPanelViewController = shadeViewController;

        mNotificationPanelViewController.setTrackingStartedListener(this::runPostCollapseRunnables);

        mNotificationPanelViewController.setOpenCloseListener(

    public void start() {

        getShadeViewController().setTrackingStartedListener(this::runPostCollapseRunnables);

        getShadeViewController().setOpenCloseListener(

                new OpenCloseListener() {

                    @Override

                    public void onClosingFinished() {