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

Commit 0cbca5b3 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge changes I60fb07e4,Ie16987a8 into tm-qpr-dev am: 231b56c7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19194467



Change-Id: I3df8f8d3a656d32e1c2a276e6641c5a1a442bb84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2f1d15e 231b56c7

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

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ public class NotifInflaterImpl implements NotifInflater { 
    }



    @Override

    public void abortInflation(NotificationEntry entry) {

        entry.abortTask();

    public boolean abortInflation(NotificationEntry entry) {

        return entry.abortTask();

    }



    @Override

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

+3 −1
Original line number Diff line number Diff line
@@ -476,11 +476,13 @@ public final class NotificationEntry extends ListEntry { 
    /**

     * Abort all existing inflation tasks

     */

    public void abortTask() {

    public boolean abortTask() {

        if (mRunningTask != null) {

            mRunningTask.abort();

            mRunningTask = null;

            return true;

        }

        return false;

    }



    public void setInflationTask(InflationTask abortableTask) {

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

+17 −15
Original line number Diff line number Diff line
@@ -314,60 +314,62 @@ public class ShadeListBuilder implements Dumpable { 
                }

            };



    private void onPreRenderInvalidated(Invalidator invalidator) {

    private void onPreRenderInvalidated(Invalidator invalidator, @Nullable String reason) {

        Assert.isMainThread();



        mLogger.logPreRenderInvalidated(invalidator.getName(), mPipelineState.getState());

        mLogger.logPreRenderInvalidated(invalidator, mPipelineState.getState(), reason);



        rebuildListIfBefore(STATE_FINALIZING);

    }



    private void onPreGroupFilterInvalidated(NotifFilter filter) {

    private void onPreGroupFilterInvalidated(NotifFilter filter, @Nullable String reason) {

        Assert.isMainThread();



        mLogger.logPreGroupFilterInvalidated(filter.getName(), mPipelineState.getState());

        mLogger.logPreGroupFilterInvalidated(filter, mPipelineState.getState(), reason);



        rebuildListIfBefore(STATE_PRE_GROUP_FILTERING);

    }



    private void onReorderingAllowedInvalidated(NotifStabilityManager stabilityManager) {

    private void onReorderingAllowedInvalidated(NotifStabilityManager stabilityManager,

            @Nullable String reason) {

        Assert.isMainThread();



        mLogger.logReorderingAllowedInvalidated(

                stabilityManager.getName(),

                mPipelineState.getState());

                stabilityManager,

                mPipelineState.getState(),

                reason);



        rebuildListIfBefore(STATE_GROUPING);

    }



    private void onPromoterInvalidated(NotifPromoter promoter) {

    private void onPromoterInvalidated(NotifPromoter promoter, @Nullable String reason) {

        Assert.isMainThread();



        mLogger.logPromoterInvalidated(promoter.getName(), mPipelineState.getState());

        mLogger.logPromoterInvalidated(promoter, mPipelineState.getState(), reason);



        rebuildListIfBefore(STATE_TRANSFORMING);

    }



    private void onNotifSectionInvalidated(NotifSectioner section) {

    private void onNotifSectionInvalidated(NotifSectioner section, @Nullable String reason) {

        Assert.isMainThread();



        mLogger.logNotifSectionInvalidated(section.getName(), mPipelineState.getState());

        mLogger.logNotifSectionInvalidated(section, mPipelineState.getState(), reason);



        rebuildListIfBefore(STATE_SORTING);

    }



    private void onFinalizeFilterInvalidated(NotifFilter filter) {

    private void onFinalizeFilterInvalidated(NotifFilter filter, @Nullable String reason) {

        Assert.isMainThread();



        mLogger.logFinalizeFilterInvalidated(filter.getName(), mPipelineState.getState());

        mLogger.logFinalizeFilterInvalidated(filter, mPipelineState.getState(), reason);



        rebuildListIfBefore(STATE_FINALIZE_FILTERING);

    }



    private void onNotifComparatorInvalidated(NotifComparator comparator) {

    private void onNotifComparatorInvalidated(NotifComparator comparator, @Nullable String reason) {

        Assert.isMainThread();



        mLogger.logNotifComparatorInvalidated(comparator.getName(), mPipelineState.getState());

        mLogger.logNotifComparatorInvalidated(comparator, mPipelineState.getState(), reason);



        rebuildListIfBefore(STATE_SORTING);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public class BubbleCoordinator implements Coordinator { 


        @Override

        public void invalidateNotifications(String reason) {

            mNotifFilter.invalidateList();

            mNotifFilter.invalidateList(reason);

        }



        @Override

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

+4 −4
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ class DebugModeCoordinator @Inject constructor( 
) : Coordinator {



    override fun attach(pipeline: NotifPipeline) {

        pipeline.addPreGroupFilter(preGroupFilter)

        debugModeFilterProvider.registerInvalidationListener(preGroupFilter::invalidateList)

        pipeline.addPreGroupFilter(filter)

        debugModeFilterProvider.registerInvalidationListener { filter.invalidateList(null) }

    }



    private val preGroupFilter = object : NotifFilter("DebugModeCoordinator") {

    private val filter = object : NotifFilter("DebugModeFilter") {

        override fun shouldFilterOut(entry: NotificationEntry, now: Long) =

            debugModeFilterProvider.shouldFilterOut(entry)

    }