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

Commit 420115e7 authored by Kevin's avatar Kevin
Browse files

Fix task adapter notify merge conflict 

Resolved merge conflict of ag/7093095 incorrectly and accidentally kept
both HEAD and CL changes. Resolved in this CL.

Test: Manual test
Change-Id: Iad42ab12b486201f496c83f99c8c6094273543f3
parent 86599255

go/quickstep/src/com/android/quickstep/views/IconRecentsView.java

+4 −7
Original line number Diff line number Diff line
@@ -239,14 +239,11 @@ public final class IconRecentsView extends FrameLayout { 
                // Set item animator for content filling animation. The item animator will switch

                // back to the default on completion

                mTaskRecyclerView.setItemAnimator(mLoadingContentItemAnimator);

            }

            mTaskAdapter.notifyItemRangeRemoved(TASKS_START_POSITION + numActualItems,

                    numEmptyItems - numActualItems);

            mTaskAdapter.notifyItemRangeChanged(TASKS_START_POSITION, numActualItems,

                    CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT);

            }

            mTaskAdapter.notifyItemRangeRemoved(numActualItems, numEmptyItems - numActualItems);

            mTaskAdapter.notifyItemRangeChanged(

                    0, numActualItems, CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT);

        });

    }