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

Commit c4da37be authored by Steve Elliott's avatar Steve Elliott
Browse files

Inline notif pipeline flag in NotifEntryManager 

This change is a no-op; the flag is now enabled-by-default, so all
removed code paths here are effectively dead.

Bug: 200269355
Test: atest SystemUITests
Change-Id: I6a04d1c238ea938a60cc2bb1f28d780480ad67fd
Merged-In: I6a04d1c238ea938a60cc2bb1f28d780480ad67fd
parent 62f5d644

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

+0 −4
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.SmartReplyController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.events.PrivacyDotViewController;
@@ -323,7 +322,6 @@ public class Dependency { 
    @Inject Lazy<SmartReplyConstants> mSmartReplyConstants;

    @Inject Lazy<NotificationListener> mNotificationListener;

    @Inject Lazy<NotificationLogger> mNotificationLogger;

    @Inject Lazy<NotificationViewHierarchyManager> mNotificationViewHierarchyManager;

    @Inject Lazy<NotificationFilter> mNotificationFilter;

    @Inject Lazy<KeyguardDismissUtil> mKeyguardDismissUtil;

    @Inject Lazy<SmartReplyController> mSmartReplyController;
@@ -540,8 +538,6 @@ public class Dependency { 
        mProviders.put(SmartReplyConstants.class, mSmartReplyConstants::get);

        mProviders.put(NotificationListener.class, mNotificationListener::get);

        mProviders.put(NotificationLogger.class, mNotificationLogger::get);

        mProviders.put(NotificationViewHierarchyManager.class,

                mNotificationViewHierarchyManager::get);

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java

+0 −10
Original line number Diff line number Diff line
@@ -49,16 +49,6 @@ public interface NotificationPresenter extends ExpandableNotificationRow.OnExpan 
     */

    boolean isDeviceInVrMode();



    /**

     * Updates the visual representation of the notifications.

     */

    void updateNotificationViews(String reason);



    /**

     * Called when the row states are updated by {@link NotificationViewHierarchyManager}.

     */

    void onUpdateRowStates();



    /**

     * @return true if the shade is collapsing.

     */

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

deleted100644 → 0
+0 −631

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java

+0 −52
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ import android.service.dreams.IDreamManager; 


import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.statusbar.IStatusBarService;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.dagger.SysUISingleton;

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

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.media.MediaDataManager;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -42,23 +40,16 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.RemoteInputNotificationRebuilder;

import com.android.systemui.statusbar.SmartReplyController;

import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.commandline.CommandRegistry;

import com.android.systemui.statusbar.gesture.SwipeStatusBarAwayGestureHandler;

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

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

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

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

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

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

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

import com.android.systemui.statusbar.notification.collection.legacy.LowPriorityInflationHelper;

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;

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

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;

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

import com.android.systemui.statusbar.phone.CentralSurfaces;
@@ -73,13 +64,11 @@ import com.android.systemui.statusbar.phone.StatusBarRemoteInputCallback; 
import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController;

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallFlags;

import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLogger;

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

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.tracing.ProtoTracer;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.time.SystemClock;

import com.android.wm.shell.bubbles.Bubbles;



import java.util.Optional;

import java.util.concurrent.Executor;
@@ -182,47 +171,6 @@ public interface CentralSurfacesDependenciesModule { 
    NotificationRemoteInputManager.Callback provideNotificationRemoteInputManagerCallback(

            StatusBarRemoteInputCallback callbackImpl);



    /** */

    @SysUISingleton

    @Provides

    static NotificationViewHierarchyManager provideNotificationViewHierarchyManager(

            Context context,

            @Main Handler mainHandler,

            FeatureFlags featureFlags,

            NotificationLockscreenUserManager notificationLockscreenUserManager,

            NotificationGroupManagerLegacy groupManager,

            VisualStabilityManager visualStabilityManager,

            StatusBarStateController statusBarStateController,

            NotificationEntryManager notificationEntryManager,

            KeyguardBypassController bypassController,

            Optional<Bubbles> bubblesOptional,

            DynamicPrivacyController privacyController,

            DynamicChildBindController dynamicChildBindController,

            LowPriorityInflationHelper lowPriorityInflationHelper,

            AssistantFeedbackController assistantFeedbackController,

            NotifPipelineFlags notifPipelineFlags,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardStateController keyguardStateController) {

        return new NotificationViewHierarchyManager(

                context,

                mainHandler,

                featureFlags,

                notificationLockscreenUserManager,

                groupManager,

                visualStabilityManager,

                statusBarStateController,

                notificationEntryManager,

                bypassController,

                bubblesOptional,

                privacyController,

                dynamicChildBindController,

                lowPriorityInflationHelper,

                assistantFeedbackController,

                notifPipelineFlags,

                keyguardUpdateMonitor,

                keyguardStateController);

    }



    /**

     * Provides our instance of CommandQueue which is considered optional.

     */

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt

+0 −9
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ class NotifPipelineFlags @Inject constructor( 
    val featureFlags: FeatureFlags

) {

    fun checkLegacyPipelineEnabled(): Boolean {

        if (!isNewPipelineEnabled()) {

            return true

        }



        if (Compile.IS_DEBUG) {

            Toast.makeText(context, "Old pipeline code running!", Toast.LENGTH_SHORT).show()

        }
@@ -45,11 +41,6 @@ class NotifPipelineFlags @Inject constructor( 
        return false

    }



    fun assertLegacyPipelineEnabled(): Unit =

        check(!isNewPipelineEnabled()) { "Old pipeline code running w/ new pipeline enabled" }



    fun isNewPipelineEnabled(): Boolean = true



    fun isDevLoggingEnabled(): Boolean =

        featureFlags.isEnabled(Flags.NOTIFICATION_PIPELINE_DEVELOPER_LOGGING)