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

Commit 74b82f43 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "New pipeline is always initialized; remove the confusing feature flag."

parents 573862c2 f5295612

packages/SystemUI/src/com/android/systemui/flags/FeatureFlags.java

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ public class FeatureFlags { 
        return false;

    }



    public boolean isNewNotifPipelineEnabled() {

        return isEnabled(Flags.NEW_NOTIFICATION_PIPELINE);

    }



    public boolean isNewNotifPipelineRenderingEnabled() {

        return isEnabled(Flags.NEW_NOTIFICATION_PIPELINE_RENDERING);

    }

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ public class Flags { 


    /***************************************/

    // 100 - notification

    public static final BooleanFlag NEW_NOTIFICATION_PIPELINE =

            new BooleanFlag(100, true);



    public static final BooleanFlag NEW_NOTIFICATION_PIPELINE_RENDERING =

            new BooleanFlag(101, false);

packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt

+6 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ class NotificationsControllerImpl @Inject constructor( 
        notifBindPipelineInitializer.initialize()

        animatedImageNotificationManager.bind()



        if (featureFlags.isNewNotifPipelineEnabled) {

        if (INITIALIZE_NEW_PIPELINE) {

            newNotifPipeline.get().initialize(

                    notificationListener,

                    notificationRowBinder,
@@ -170,4 +170,9 @@ class NotificationsControllerImpl @Inject constructor( 
    override fun getActiveNotificationsCount(): Int {

        return entryManager.activeNotificationsCount

    }



    companion object {

        // NOTE: The new pipeline is always active, even if the old pipeline is *rendering*.

        private const val INITIALIZE_NEW_PIPELINE = true

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase { 
        when(mVisualStabilityManager.areGroupChangesAllowed()).thenReturn(true);

        when(mVisualStabilityManager.isReorderingAllowed()).thenReturn(true);



        when(mFeatureFlags.isNewNotifPipelineEnabled()).thenReturn(false);

        when(mFeatureFlags.checkLegacyPipelineEnabled()).thenReturn(true);



        mHelper = new NotificationTestHelper(mContext, mDependency, TestableLooper.get(this));

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ public class NotificationEntryManagerTest extends SysuiTestCase { 
        mEntry = createNotification();

        mSbn = mEntry.getSbn();



        when(mFeatureFlags.isNewNotifPipelineEnabled()).thenReturn(false);

        when(mFeatureFlags.isNewNotifPipelineRenderingEnabled()).thenReturn(false);

        mEntryManager = new NotificationEntryManager(

                mLogger,