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

Commit 0daaff2b authored by Justin Weir's avatar Justin Weir
Browse files

Remove HeadsUpManagerPhone from some variants 

HeadsUpMangerPhone is only needed in phones and car, but it is
included in all variants. This currently blocks development of the
new shade domain layer, because we'd need to spend time updating the
variants to include it when we add integrate HeadsUpManagerPhone.
I tried cleaning up some dependencies in order to prevent variants
from wanting it in the first place, but that change wasn't viable.
This change extracts an interface and binds a no op impl in the
variants that don't need it and HeadsUpMangerPhone in those that do.
It also changes the class to a singleton and makes the constructor
injectable to simplify its binding.

Fixes: 302508896
Test: build and presubmits are sufficient
Change-Id: Ie58072d294e37915b08421fb36825d3913c634af
parent c7873f85

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

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 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;
@@ -33,7 +32,6 @@ import dagger.Subcomponent; 
        DependencyProvider.class,

        NotificationInsetsModule.class,

        QsFrameTranslateModule.class,

        ShadeModule.class,

        ShutdownUiModule.class,

        SystemUIBinder.class,

        SystemUIModule.class,

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

+4 −45
Original line number Diff line number Diff line
@@ -21,12 +21,9 @@ import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME; 


import android.content.Context;

import android.hardware.SensorPrivacyManager;

import android.os.Handler;



import com.android.internal.logging.UiEventLogger;

import com.android.keyguard.KeyguardViewController;

import com.android.systemui.battery.BatterySaverModule;

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

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.doze.DozeHost;
@@ -34,7 +31,6 @@ import com.android.systemui.media.dagger.MediaModule; 
import com.android.systemui.navigationbar.NavigationBarControllerModule;

import com.android.systemui.navigationbar.gestural.GestureModule;

import com.android.systemui.plugins.qs.QSFactory;

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

import com.android.systemui.power.dagger.PowerModule;

import com.android.systemui.qs.dagger.QSModule;

import com.android.systemui.qs.tileimpl.QSFactoryImpl;
@@ -45,7 +41,7 @@ import com.android.systemui.scene.SceneContainerFrameworkModule; 
import com.android.systemui.screenshot.ReferenceScreenshotModule;

import com.android.systemui.settings.dagger.MultiUserUtilsModule;

import com.android.systemui.shade.NotificationShadeWindowControllerImpl;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shade.ShadeModule;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.KeyboardShortcutsModule;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;
@@ -53,20 +49,13 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl; 
import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule;

import com.android.systemui.statusbar.events.StatusBarEventsModule;

import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

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

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

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

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

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

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragmentStartableModule;

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

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.policy.SensorPrivacyController;
@@ -100,11 +89,13 @@ import javax.inject.Named; 
        BatterySaverModule.class,

        CollapsedStatusBarFragmentStartableModule.class,

        GestureModule.class,

        HeadsUpModule.class,

        MediaModule.class,

        MultiUserUtilsModule.class,

        NavigationBarControllerModule.class,

        PowerModule.class,

        QSModule.class,

        ShadeModule.class,

        ReferenceScreenshotModule.class,

        RotationLockModule.class,

        SceneContainerFrameworkModule.class,
@@ -161,38 +152,6 @@ public abstract class ReferenceSystemUIModule { 
        return true;

    }



    @SysUISingleton

    @Provides

    static HeadsUpManagerPhone provideHeadsUpManagerPhone(

            Context context,

            HeadsUpManagerLogger headsUpManagerLogger,

            StatusBarStateController statusBarStateController,

            KeyguardBypassController bypassController,

            GroupMembershipManager groupManager,

            VisualStabilityProvider visualStabilityProvider,

            ConfigurationController configurationController,

            @Main Handler handler,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            UiEventLogger uiEventLogger,

            ShadeExpansionStateManager shadeExpansionStateManager) {

        return new HeadsUpManagerPhone(

                context,

                headsUpManagerLogger,

                statusBarStateController,

                bypassController,

                groupManager,

                visualStabilityProvider,

                configurationController,

                handler,

                accessibilityManagerWrapper,

                uiEventLogger,

                shadeExpansionStateManager

        );

    }



    @Binds

    abstract HeadsUpManager bindHeadsUpManagerPhone(HeadsUpManagerPhone headsUpManagerPhone);



    @Provides

    @SysUISingleton

    static Recents provideRecents(Context context, RecentsImplementation recentsImplementation,

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

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ public class DebugDrawable extends Drawable { 
        mDebugPaint.setStrokeWidth(2);

        mDebugPaint.setStyle(Paint.Style.STROKE);

        mDebugPaint.setTextSize(24);

        String headerDebugInfo = mNotificationPanelViewController.getHeaderDebugInfo();

        if (headerDebugInfo != null) canvas.drawText(headerDebugInfo, 50, 100, mDebugPaint);



        drawDebugInfo(canvas, mNotificationPanelViewController.getMaxPanelHeight(),

                Color.RED, "getMaxPanelHeight()");

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

+6 −10
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; 
import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.shared.model.TransitionState;

import com.android.systemui.keyguard.shared.model.TransitionStep;

import com.android.systemui.power.shared.model.WakefulnessModel;

import com.android.systemui.keyguard.ui.binder.KeyguardLongPressViewBinder;

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

import com.android.systemui.keyguard.ui.viewmodel.GoneToDreamingLockscreenHostedTransitionViewModel;
@@ -162,9 +161,10 @@ 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.power.domain.interactor.PowerInteractor;

import com.android.systemui.power.shared.model.WakefulnessModel;

import com.android.systemui.res.R;

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

import com.android.systemui.power.domain.interactor.PowerInteractor;

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

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.statusbar.CommandQueue;
@@ -200,7 +200,6 @@ import com.android.systemui.statusbar.phone.BounceInterpolator; 
import com.android.systemui.statusbar.phone.CentralSurfaces;

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

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

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

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

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

import com.android.systemui.statusbar.phone.KeyguardBottomAreaViewController;
@@ -217,6 +216,7 @@ import com.android.systemui.statusbar.phone.TapAgainViewController; 
import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;

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

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

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

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

import com.android.systemui.statusbar.policy.KeyguardUserSwitcherController;
@@ -362,7 +362,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private boolean mIsLaunchAnimationRunning;

    private float mOverExpansion;

    private CentralSurfaces mCentralSurfaces;

    private HeadsUpManagerPhone mHeadsUpManager;

    private HeadsUpManager mHeadsUpManager;

    private float mExpandedHeight = 0;

    /** The current squish amount for the predictive back animation */

    private float mCurrentBackProgress = 0.0f;
@@ -3025,7 +3025,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        return headsUpVisible || isExpanded() || mBouncerShowing;

    }



    private void setHeadsUpManager(HeadsUpManagerPhone headsUpManager) {

    private void setHeadsUpManager(HeadsUpManager headsUpManager) {

        mHeadsUpManager = headsUpManager;

        mHeadsUpManager.addListener(mOnHeadsUpChangedListener);

        mHeadsUpTouchHelper = new HeadsUpTouchHelper(
@@ -3507,7 +3507,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            GestureRecorder recorder,

            Runnable hideExpandedRunnable,

            NotificationShelfController notificationShelfController,

            HeadsUpManagerPhone headsUpManager) {

            HeadsUpManager headsUpManager) {

        setHeadsUpManager(headsUpManager);

        // TODO(b/254859580): this can be injected.

        mCentralSurfaces = centralSurfaces;
@@ -3556,10 +3556,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mView.getViewTreeObserver().removeOnGlobalLayoutListener(listener);

    }



    String getHeaderDebugInfo() {

        return "USER " + mHeadsUpManager.getUser();

    }



    @Override

    public void onThemeChanged() {

        mConfigurationListener.onThemeChanged();

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

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import com.android.systemui.statusbar.GestureRecorder 
import com.android.systemui.statusbar.NotificationShelfController

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

import com.android.systemui.statusbar.phone.CentralSurfaces

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone

import com.android.systemui.statusbar.policy.HeadsUpManager



/**

 * Allows CentralSurfacesImpl to interact with the shade. Only CentralSurfacesImpl should reference
@@ -34,7 +34,7 @@ interface ShadeSurface : ShadeViewController { 
        recorder: GestureRecorder,

        hideExpandedRunnable: Runnable,

        notificationShelfController: NotificationShelfController,

        headsUpManager: HeadsUpManagerPhone

        headsUpManager: HeadsUpManager

    )



    /** Cancels any pending collapses. */