summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2016-04-14 14:57:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-04-14 14:57:45 +0000
commitdea7075249e0825a9ec44be7371b898a3bf3abb3 (patch)
tree47767e3beee426372ec0240f3ddf26dcd3757ef4
parent82676d9f8810f4ab3e943e89df135cc87857f537 (diff)
parent42317eade538975345297bb20ae3b7d2e3c4232b (diff)
Merge "QS Edit: Fix drag to add tiles going away" into nyc-dev
-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 e8e17b1d15c3..8925d457a8fb 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
@@ -387,7 +387,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
}
}
}
- if (mTiles.get(mTiles.size() - 1) == null) {
+ if (mTiles.size() - 1 == mTileDividerIndex) {
mTiles.remove(mTiles.size() - 1);
}
}