commit bb9c22a215f5bb5caa37db81abbf3d8aa5639f95
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 22 23:29:37 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 22 23:29:37 2019 +0000
tree 303883087610a11e716920a8b20fb935f503109d
parent d28d8813295571e9a50d641fa036202cd4fc794e
parent cd88cf8d1c37c65e55f98e7003151663ceeebf0a

Merge "Clear all button should not be swipable" into ub-launcher3-master

go/quickstep/src/com/android/quickstep/TaskAdapter.java

diff --git a/go/quickstep/src/com/android/quickstep/TaskAdapter.java b/go/quickstep/src/com/android/quickstep/TaskAdapter.java
index 8651698..6f75629 100644
--- a/go/quickstep/src/com/android/quickstep/TaskAdapter.java
+++ b/go/quickstep/src/com/android/quickstep/TaskAdapter.java
@@ -43,9 +43,10 @@
     public static final int MAX_TASKS_TO_DISPLAY = 6;
     public static final int TASKS_START_POSITION = 1;
 
+    public static final int ITEM_TYPE_TASK = 0;
+    public static final int ITEM_TYPE_CLEAR_ALL = 1;
+
     private static final String TAG = "TaskAdapter";
-    private static final int ITEM_TYPE_TASK = 0;
-    private static final int ITEM_TYPE_CLEAR_ALL = 1;
     private final TaskListLoader mLoader;
     private TaskActionController mTaskActionController;
     private OnClickListener mClearAllListener;

go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java

diff --git a/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java b/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
index 98407d8..19951bb 100644
--- a/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
+++ b/go/quickstep/src/com/android/quickstep/TaskSwipeCallback.java
@@ -17,6 +17,9 @@
 
 import static androidx.recyclerview.widget.ItemTouchHelper.RIGHT;
 
+import static com.android.quickstep.TaskAdapter.ITEM_TYPE_CLEAR_ALL;
+
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
@@ -45,4 +48,14 @@
             mTaskActionController.removeTask((TaskHolder) viewHolder);
         }
     }
+
+    @Override
+    public int getSwipeDirs(@NonNull RecyclerView recyclerView,
+            @NonNull ViewHolder viewHolder) {
+        if (viewHolder.getItemViewType() == ITEM_TYPE_CLEAR_ALL) {
+            // Clear all button should not be swipable.
+            return 0;
+        }
+        return super.getSwipeDirs(recyclerView, viewHolder);
+    }
 }