Merge "Fix TB bugs in QSCustomizer TileAdapter" (1d8b721e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta

		public void saveSpecs(QSTileHost host) {
		List<String> newSpecs = new ArrayList<>();
		clearAccessibilityState();
		for (int i = 1; i < mTiles.size() && mTiles.get(i) != null; i++) {
		newSpecs.add(mTiles.get(i).spec);
		}
		@@ -120,6 +121,17 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		mCurrentSpecs = newSpecs;
		}

		private void clearAccessibilityState() {
		if (mAccessibilityAction == ACTION_ADD) {
		// Remove blank tile from last spot
		mTiles.remove(--mEditIndex);
		// Update the tile divider position
		mTileDividerIndex--;
		notifyDataSetChanged();
		}
		mAccessibilityAction = ACTION_NONE;
		}

		public void resetTileSpecs(QSTileHost host, List<String> specs) {
		// Notify the host so the tiles get removed callbacks.
		host.changeTiles(mCurrentSpecs, specs);
		@@ -333,8 +345,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		// Remove the placeholder.
		mTiles.remove(mEditIndex--);
		notifyItemRemoved(mEditIndex);
		// Don't remove items when the last position is selected.
		if (position == mEditIndex - 1) position--;
		}
		mAccessibilityAction = ACTION_NONE;
		move(mAccessibilityFromIndex, position, v);
		@@ -372,6 +382,8 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
		mAccessibilityAction = ACTION_ADD;
		// Add placeholder for last slot.
		mTiles.add(mEditIndex++, null);
		// Update the tile divider position
		mTileDividerIndex++;
		mNeedsFocus = true;
		notifyDataSetChanged();
		}