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

Commit 8066807e authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Revert^2 "Fix isRemoved not being set for rows" 

This reverts commit 1fbda547.

Reason for revert: re-landing change without hack from I655c7f30ade4ee9b010f71dcb902afe8910f4ea4

Bug: 417457086
Bug: 415665263
Fix: 421371921
Change-Id: Ic0cb6ffdee436045f717f355098ff25bbe4c3625
parent 19e3bb12

packages/SystemUI/aconfig/systemui.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -66,6 +66,16 @@ flag { 
   bug: "343942780"

}



flag {

   name: "notification_row_is_removed_fix"

   namespace: "systemui"

   description: "Fix incorrect isRemoved value in ExpandableNotificationRow"

   bug: "417457086"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "notification_ambient_suppression_after_inflation"

   namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java

+0 −12
Original line number Diff line number Diff line
@@ -712,18 +712,6 @@ public final class NotificationEntry extends ListEntry { 
        return row != null && row.isDismissed();

    }



    public boolean isRowRemoved() {

        return row != null && row.isRemoved();

    }



    /**

     * @return {@code true} if the row is null or removed

     */

    public boolean isRemoved() {

        //TODO: recycling invalidates this

        return row == null || row.isRemoved();

    }



    public boolean isRowPinned() {

        return getPinnedStatus().isPinned();

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotifBindPipeline.java

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


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



import static com.android.systemui.Flags.notificationRowIsRemovedFix;



import android.util.ArrayMap;

import android.util.ArraySet;

import android.widget.FrameLayout;
@@ -218,6 +220,13 @@ public final class NotifBindPipeline { 
            mStage.deleteStageParams(entry);

            mStartProcessor.cancel(entry);

        }



        @Override

        public void onEntryRemoved(NotificationEntry entry, int reason) {

            if (notificationRowIsRemovedFix()) {

                entry.removeRow();

            }

        }

    };



    private @NonNull BindEntry getBindEntry(NotificationEntry entry) {