Merge "Fix QS edit accessibility" into nyc-dev

This commit is contained in:
Jason Monk
2016-04-20 15:14:50 +00:00
committed by Android (Google) Code Review

View File

@@ -279,6 +279,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
private void selectPosition(int position, View v) { private void selectPosition(int position, View v) {
// Remove the placeholder. // Remove the placeholder.
notifyItemRemoved(mEditIndex);
mTiles.remove(mEditIndex--); mTiles.remove(mEditIndex--);
mAccessibilityMoving = false; mAccessibilityMoving = false;
move(mAccessibilityFromIndex, position, v); move(mAccessibilityFromIndex, position, v);
@@ -323,7 +324,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
} }
private boolean move(int from, int to, View v) { private boolean move(int from, int to, View v) {
if (to >= mEditIndex) { if (to > mEditIndex) {
if (from >= mEditIndex) { if (from >= mEditIndex) {
return false; return false;
} }