From b6519e1036e888d8f1a43415f3fcde38f01cddc0 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 18 Apr 2019 16:59:06 -0700 Subject: 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 (cherry picked from 420115e7f1ccb881502ce126d74583eba8b2bb8d) --- .../src/com/android/quickstep/views/IconRecentsView.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'go/quickstep') diff --git a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java index 1f6696a32..6b4d03cc2 100644 --- a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java +++ b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java @@ -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); + mTaskAdapter.notifyItemRangeRemoved(TASKS_START_POSITION + numActualItems, + numEmptyItems - numActualItems); + mTaskAdapter.notifyItemRangeChanged(TASKS_START_POSITION, numActualItems, + CHANGE_EVENT_TYPE_EMPTY_TO_CONTENT); }); } -- cgit v1.2.3