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

Commit 4943b86b authored by Kevin Han's avatar Kevin Han
Browse files

Hook up new pipeline so notifs are visible 

Various small bugs made it so that turning on the new pipeline wouldn't
actually show anything. This CL takes out some of these bugs so
that turning on the pipeline shows you notifications.

Everything is still pretty broken (although not TOO crashy), but you can
at least confirm some things are working (things are inflating!)

Bug: 112656837
Test: adb shell device_config put systemui
notification.newpipeline.rendering true
Test: smoke test while rendering flag is off

Change-Id: Ie2f407963240d8bf98ae194397b4a4fd00b55c9a
parent 027c8238

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ public class NotificationEntryManager implements 
     */

    public void updateNotifications(String reason) {

        reapplyFilterAndSort(reason);

        if (mPresenter != null) {

        if (mPresenter != null && !mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {

            mPresenter.updateNotificationViews();

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifViewManager.kt

+6 −3
Original line number Diff line number Diff line
@@ -142,9 +142,11 @@ class NotifViewManager @Inject constructor( 
        // To attach rows we can use _this one weird trick_: if the intended view to add does not

        // have a parent, then simply add it (and its children).

        entries.forEach { entry ->

            val listItem = rowRegistry.requireView(entry)

            // TODO: We should eventually map GroupEntry's themselves to views so that we don't

            // depend on representativeEntry here which may actually be null in the future

            val listItem = rowRegistry.requireView(entry.representativeEntry!!)



            if (listItem.view.parent != null) {

            if (listItem.view.parent == null) {

                listContainer.addListItem(listItem)

                stabilityManager.notifyViewAddition(listItem.view)

            }
@@ -153,7 +155,8 @@ class NotifViewManager @Inject constructor( 
                for ((idx, childEntry) in entry.children.withIndex()) {

                    val childListItem = rowRegistry.requireView(childEntry)

                    // Child hasn't been added yet. add it!

                    if (!listItem.notificationChildren.contains(childListItem)) {

                    if (listItem.notificationChildren == null ||

                            !listItem.notificationChildren.contains(childListItem)) {

                        // TODO: old code here just Log.wtf()'d here. This might wreak havoc

                        if (childListItem.view.parent != null) {

                            throw IllegalStateException("trying to add a notification child that " +

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -6466,7 +6466,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 


    private boolean hasActiveNotifications() {

        if (mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {

            return mNotifPipeline.getShadeList().isEmpty();

            return !mNotifPipeline.getShadeList().isEmpty();

        } else {

            return mEntryManager.hasActiveNotifications();

        }