summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author wuliang <yueyudeguang@gmail.com> 2017-08-31 17:16:28 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-31 17:16:28 +0000
commitce7983b84ae42a321d14de4634b39567e849ac57 (patch)
tree48eb1a1cca41df2433ddfb552ab2d664b4a958d3
parent10643893106e5c02f83b8e43589ab015a536f12b (diff)
parent8ad2dc36156764ad5f475b9d7f29350c86936fa8 (diff)
Merge "Test: Drag on the divider line." am: 1fa3a60f05 am: 290bfff7d0
am: 8ad2dc3615 Change-Id: Ibc0b05c150de915d15d1aff13959797a86b1b775
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
index 0a0d2ce00a1b..bdc5e7d75b48 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
@@ -556,7 +556,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
@Override
public int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHolder) {
- if (viewHolder.getItemViewType() == TYPE_EDIT) {
+ if (viewHolder.getItemViewType() == TYPE_EDIT || viewHolder.getItemViewType() == TYPE_DIVIDER) {
return makeMovementFlags(0, 0);
}
int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.RIGHT