diff options
| author | Kevin <kevhan@google.com> | 2019-04-18 16:59:06 -0700 |
|---|---|---|
| committer | Kevin Han <kevhan@google.com> | 2019-04-23 19:25:50 +0000 |
| commit | b6519e1036e888d8f1a43415f3fcde38f01cddc0 (patch) | |
| tree | 817942a2584873034b5988807efe042a0a3266c5 /go/quickstep | |
| parent | 4ba81d1c6f329f3a67fef47c948a48c2a8c90a73 (diff) | |
| download | android_packages_apps_Trebuchet-b6519e1036e888d8f1a43415f3fcde38f01cddc0.tar.gz android_packages_apps_Trebuchet-b6519e1036e888d8f1a43415f3fcde38f01cddc0.tar.bz2 android_packages_apps_Trebuchet-b6519e1036e888d8f1a43415f3fcde38f01cddc0.zip | |
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)
Diffstat (limited to 'go/quickstep')
| -rw-r--r-- | go/quickstep/src/com/android/quickstep/views/IconRecentsView.java | 11 |
1 files changed, 4 insertions, 7 deletions
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); }); } |