Merge "QS: Fix accidental a11y tile removal" into nyc-mr1-dev

2016-08-05 15:49:10 +00:00
parent 549c81c270 c896963063
commit 797b658428
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
@@ -297,6 +297,9 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
        mAccessibilityMoving = false;
        mTiles.remove(mEditIndex--);
        notifyItemRemoved(mEditIndex - 1);
+        // Don't remove items when the last position is selected.
+        if (position == mEditIndex) position--;
+
        move(mAccessibilityFromIndex, position, v);
        notifyDataSetChanged();
    }