Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove task based on object rather than position" into nyc-dev

Browse Source 
am: e1293b7d07

* commit 'e1293b7d07f5854337fef35a2e3b4338df90866e':
  Remove task based on object rather than position

Change-Id: I74d2dec60c6e7173d818d92ac166143a6b292f40
This commit is contained in:
Sid Soundararajan
2016-05-13 21:26:57 +00:00
committed by android-build-merger
parent c38966194b e1293b7d07
commit a02fbe1ea0
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java
View File

@@ -16,7 +16,6 @@
package com.android.systemui.recents.tv.views; package com.android.systemui.recents.tv.views;
import android.animation.Animator; import android.animation.Animator;
import android.app.Activity;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -87,7 +86,7 @@ public class TaskStackHorizontalViewAdapter extends
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
removeAt(position); removeTask(task);
EventBus.getDefault().send(new DeleteTaskDataEvent(task)); EventBus.getDefault().send(new DeleteTaskDataEvent(task));
mShouldReset = true; mShouldReset = true;
} }
@@ -148,20 +147,15 @@ public class TaskStackHorizontalViewAdapter extends
return mTaskList.size(); return mTaskList.size();
} }
private void removeAt(int position) {
Task removedTask = mTaskList.remove(position);
if (mGridView != null) {
mGridView.getStack().removeTask(removedTask, AnimationProps.IMMEDIATE,
false);
}
notifyItemRemoved(position);
}
public void removeTask(Task task) { public void removeTask(Task task) {
int position = mTaskList.indexOf(task); int position = mTaskList.indexOf(task);
if (position >= 0) { if (position >= 0) {
mTaskList.remove(position); mTaskList.remove(position);
notifyItemRemoved(position); notifyItemRemoved(position);
if (mGridView != null) {
mGridView.getStack().removeTask(task, AnimationProps.IMMEDIATE,
false);
}
} }
} }