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

Commit 78f35e4e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add notification panel mediator that does not have any drag open...

Merge "Merge "Add notification panel mediator that does not have any drag open behavior." into rvc-dev am: a26138bc am: 885019f0" into rvc-d1-dev-plus-aosp am: 02430a8a

Change-Id: I16d9eb87d68b88f335d033332cc0a2db49240dfc
parents b2a5d7b0 02430a8a
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -26,8 +26,15 @@ import com.android.systemui.car.navigationbar.CarNavigationBarController;
import com.android.systemui.car.window.OverlayViewMediator;
import com.android.systemui.statusbar.policy.ConfigurationController;

/** The view mediator which attaches the view controller to other elements of the system ui. */
public abstract class NotificationPanelViewMediator implements OverlayViewMediator,
import javax.inject.Inject;
import javax.inject.Singleton;

/**
 * The view mediator which attaches the view controller to other elements of the system ui. Disables
 * drag open behavior of the notification panel from any navigation bar.
 */
@Singleton
public class NotificationPanelViewMediator implements OverlayViewMediator,
        ConfigurationController.ConfigurationListener {

    private final CarNavigationBarController mCarNavigationBarController;
@@ -36,6 +43,7 @@ public abstract class NotificationPanelViewMediator implements OverlayViewMediat
    private final CarDeviceProvisionedController mCarDeviceProvisionedController;
    private final ConfigurationController mConfigurationController;

    @Inject
    public NotificationPanelViewMediator(
            CarNavigationBarController carNavigationBarController,
            NotificationPanelViewController notificationPanelViewController,
+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.car.window;

import com.android.systemui.car.keyguard.CarKeyguardViewMediator;
import com.android.systemui.car.notification.BottomNotificationPanelViewMediator;
import com.android.systemui.car.notification.NotificationPanelViewMediator;
import com.android.systemui.car.notification.TopNotificationPanelViewMediator;
import com.android.systemui.car.userswitcher.FullscreenUserSwitcherViewMediator;

@@ -32,6 +33,13 @@ import dagger.multibindings.IntoMap;
@Module
public abstract class OverlayWindowModule {

    /** Injects NotificationPanelViewMediator. */
    @Binds
    @IntoMap
    @ClassKey(NotificationPanelViewMediator.class)
    public abstract OverlayViewMediator bindNotificationPanelViewMediator(
            NotificationPanelViewMediator notificationPanelViewMediator);

    /** Injects TopNotificationPanelViewMediator. */
    @Binds
    @IntoMap