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

Commit bcb49947 authored by Beverly Tai's avatar Beverly Tai
Browse files

Revert "Create interface for NotifInterruptStateProvider" 

Revert "Move HUNs and pulsing to interrupt package"

Revert submission 10548462-hun_interrupt_package
Fixes: b/151050224

Reason for revert: broke HUNs
Reverted Changes:
I5ad5546d6:Move HUNs and pulsing to interrupt package
I13be75809:Create interface for NotifInterruptStateProvider

Change-Id: I421a7906a87236fb18fc3d434d654fb18c35e6a2
parent e73aea2e

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME; 
import android.content.Context;



import com.android.systemui.car.CarDeviceProvisionedControllerImpl;

import com.android.systemui.car.CarNotificationInterruptionStateProvider;

import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;
@@ -38,6 +39,7 @@ import com.android.systemui.statusbar.car.CarShadeControllerImpl; 
import com.android.systemui.statusbar.car.CarStatusBar;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

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

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

import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
@@ -61,6 +63,10 @@ import dagger.Provides; 
@Module(includes = {DividerModule.class})

abstract class CarSystemUIModule {



    @Binds

    abstract NotificationInterruptionStateProvider bindNotificationInterruptionStateProvider(

            CarNotificationInterruptionStateProvider notificationInterruptionStateProvider);



    @Singleton

    @Provides

    @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME)

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java→packages/CarSystemUI/src/com/android/systemui/car/CarNotificationInterruptionStateProvider.java

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

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2018 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.
@@ -14,46 +14,41 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.notification.interruption;

package com.android.systemui.car;



import android.content.Context;



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

import com.android.systemui.statusbar.notification.NotificationFilter;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

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



/**

 * Provides bubble-up and heads-up state for notification entries.

 *

 * When a notification is heads-up when dozing, this is also called "pulsing."

 */

public interface NotificationInterruptStateProvider {

    /**

     * If the device is awake (not dozing):

     *  Whether the notification should peek in from the top and alert the user.

     *

     * If the device is dozing:

     *  Whether the notification should show the ambient view of the notification ("pulse").

     *

     * @param entry the entry to check

     * @return true if the entry should heads up, false otherwise

     */

    boolean shouldHeadsUp(NotificationEntry entry);

import javax.inject.Inject;

import javax.inject.Singleton;



    /**

     * Whether the notification should appear as a bubble with a fly-out on top of the screen.

     *

     * @param entry the entry to check

     * @return true if the entry should bubble up, false otherwise

     */

    boolean shouldBubbleUp(NotificationEntry entry);

/** Auto-specific implementation of {@link NotificationInterruptionStateProvider}. */

@Singleton

public class CarNotificationInterruptionStateProvider extends

        NotificationInterruptionStateProvider {



    /**

     * Whether to launch the entry's full screen intent when the entry is added.

     *

     * @param entry the entry that was added

     * @return {@code true} if we should launch the full screen intent

     */

    boolean shouldLaunchFullScreenIntentWhenAdded(NotificationEntry entry);

    @Inject

    public CarNotificationInterruptionStateProvider(Context context,

            NotificationFilter filter,

            StatusBarStateController stateController,

            BatteryController batteryController) {

        super(context, filter, stateController, batteryController);

    }



    /**

     * Add a component that can suppress visual interruptions.

     */

    void addSuppressor(NotificationInterruptSuppressor suppressor);

    @Override

    public boolean shouldHeadsUp(NotificationEntry entry) {

        // Because space is usually constrained in the auto use-case, there should not be a

        // pinned notification when the shade has been expanded. Ensure this by not pinning any

        // notification if the shade is already opened.

        if (!getPresenter().isPresenterFullyCollapsed()) {

            return false;

        }



        return super.shouldHeadsUp(entry);

    }

}

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+7 −22
Original line number Diff line number Diff line
@@ -97,14 +97,13 @@ import com.android.systemui.statusbar.PulseExpansionHandler; 
import com.android.systemui.statusbar.SuperStatusBarViewFactory;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotificationAlertingManager;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.interruption.BypassHeadsUpNotifier;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptSuppressor;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.phone.AutoHideController;
@@ -268,9 +267,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationInterruptStateProvider notificationInterruptStateProvider,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,

            NotificationAlertingManager notificationAlertingManager,

            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            @UiBackground Executor uiBgExecutor,
@@ -350,9 +350,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                remoteInputQuickSettingsDisabler,

                notificationGutsManager,

                notificationLogger,

                notificationInterruptStateProvider,

                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,

                notificationAlertingManager,

                displayMetrics,

                metricsLogger,

                uiBgExecutor,
@@ -490,22 +491,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                                .isCurrentUserSetupInProgress();

                    }

                });



        mNotificationInterruptStateProvider.addSuppressor(new NotificationInterruptSuppressor() {

            @Override

            public String getName() {

                return TAG;

            }



            @Override

            public boolean suppressInterruptions(NotificationEntry entry) {

                // Because space is usually constrained in the auto use-case, there should not be a

                // pinned notification when the shade has been expanded.

                // Ensure this by not allowing any interruptions (ie: pinning any notifications) if

                // the shade is already opened.

                return !getPresenter().isPresenterFullyCollapsed();

            }

        });

    }



    @Override

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+6 −3
Original line number Diff line number Diff line
@@ -58,12 +58,13 @@ import com.android.systemui.statusbar.SuperStatusBarViewFactory; 
import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

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

import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotificationAlertingManager;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.interruption.BypassHeadsUpNotifier;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.row.NotificationRowModule;
@@ -142,9 +143,10 @@ public class CarStatusBarModule { 
            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationInterruptStateProvider notificationInterruptionStateProvider,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,

            NotificationAlertingManager notificationAlertingManager,

            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            @UiBackground Executor uiBgExecutor,
@@ -226,6 +228,7 @@ public class CarStatusBarModule { 
                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,

                notificationAlertingManager,

                displayMetrics,

                metricsLogger,

                uiBgExecutor,

packages/SystemUI/src/com/android/systemui/Dependency.java

+5 −1
Original line number Diff line number Diff line
@@ -71,11 +71,12 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager; 
import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.SmartReplyController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.notification.NotificationAlertingManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager.KeyguardEnvironment;

import com.android.systemui.statusbar.notification.NotificationFilter;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.interruption.NotificationAlertingManager;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.ChannelEditorDialogController;

import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;
@@ -288,6 +289,7 @@ public class Dependency { 
    @Inject Lazy<NotificationLogger> mNotificationLogger;

    @Inject Lazy<NotificationViewHierarchyManager> mNotificationViewHierarchyManager;

    @Inject Lazy<NotificationFilter> mNotificationFilter;

    @Inject Lazy<NotificationInterruptionStateProvider> mNotificationInterruptionStateProvider;

    @Inject Lazy<KeyguardDismissUtil> mKeyguardDismissUtil;

    @Inject Lazy<SmartReplyController> mSmartReplyController;

    @Inject Lazy<RemoteInputQuickSettingsDisabler> mRemoteInputQuickSettingsDisabler;
@@ -487,6 +489,8 @@ public class Dependency { 
        mProviders.put(NotificationViewHierarchyManager.class,

                mNotificationViewHierarchyManager::get);

        mProviders.put(NotificationFilter.class, mNotificationFilter::get);

        mProviders.put(NotificationInterruptionStateProvider.class,

                mNotificationInterruptionStateProvider::get);

        mProviders.put(KeyguardDismissUtil.class, mKeyguardDismissUtil::get);

        mProviders.put(SmartReplyController.class, mSmartReplyController::get);

        mProviders.put(RemoteInputQuickSettingsDisabler.class,