Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "QS Edit: clean up tile adapter" into nyc-dev

Browse Source 
am: cbcefaf85c

* commit 'cbcefaf85c20cbbb2723544461ddcd221e06b0a7':
  QS Edit: clean up tile adapter

Change-Id: I472ccb6aba74e5cda1ffe67748ce047545e5fd9f
This commit is contained in:
Jason Monk
2016-05-03 16:36:41 +00:00
committed by android-build-merger
parent d023da1fa9 cbcefaf85c
commit aecf9510b3
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,12 +93,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
mHost = host; mHost = host;
} }
@Override
public long getItemId(int position) {
return mTiles.get(position) != null ? mAllTiles.indexOf(mTiles.get(position))
: position == mEditIndex ? EDIT_ID : DIVIDER_ID;
}
public ItemTouchHelper getItemTouchHelper() { public ItemTouchHelper getItemTouchHelper() {
return mItemTouchHelper; return mItemTouchHelper;
} }
@@ -147,8 +141,8 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
mTiles.add(tile); mTiles.add(tile);
} }
} }
if (mOtherTiles.size() != 0) {
mTileDividerIndex = mTiles.size(); mTileDividerIndex = mTiles.size();
if (mOtherTiles.size() != 0) {
mTiles.add(null); mTiles.add(null);
} }
mTiles.addAll(mOtherTiles); mTiles.addAll(mOtherTiles);
@@ -201,7 +195,13 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
} }
@Override @Override
public void onBindViewHolder(final Holder holder, final int position) { public boolean onFailedToRecycleView(Holder holder) {
holder.clearDrag();
return true;
}
@Override
public void onBindViewHolder(final Holder holder, int position) {
if (holder.getItemViewType() == TYPE_DIVIDER) { if (holder.getItemViewType() == TYPE_DIVIDER) {
return; return;
} }
@@ -222,7 +222,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
holder.mTileView.setOnClickListener(new OnClickListener() { holder.mTileView.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
selectPosition(position, v); selectPosition(holder.getAdapterPosition(), v);
} }
}); });
if (mNeedsFocus) { if (mNeedsFocus) {
@@ -267,6 +267,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
holder.mTileView.setOnClickListener(new OnClickListener() { holder.mTileView.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
int position = holder.getAdapterPosition();
if (mAccessibilityMoving) { if (mAccessibilityMoving) {
selectPosition(position, v); selectPosition(position, v);
} else { } else {
@@ -288,8 +289,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
mTiles.remove(mEditIndex--); mTiles.remove(mEditIndex--);
mAccessibilityMoving = false; mAccessibilityMoving = false;
move(mAccessibilityFromIndex, position, v); move(mAccessibilityFromIndex, position, v);
notifyItemChanged(mAccessibilityFromIndex);
notifyItemMoved(mAccessibilityFromIndex, position);
saveSpecs(mHost); saveSpecs(mHost);
} }
@@ -330,7 +329,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;
} }
@@ -352,8 +351,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
} }
CharSequence fromLabel = mTiles.get(from).state.label; CharSequence fromLabel = mTiles.get(from).state.label;
move(from, to, mTiles); move(from, to, mTiles);
notifyItemChanged(from);
notifyItemMoved(from, to);
updateDividerLocations(); updateDividerLocations();
CharSequence announcement; CharSequence announcement;
if (to >= mEditIndex) { if (to >= mEditIndex) {
@@ -399,7 +396,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
} }
if (mTiles.size() - 1 == mTileDividerIndex) { if (mTiles.size() - 1 == mTileDividerIndex) {
mTiles.remove(mTiles.size() - 1); mTiles.remove(mTiles.size() - 1);
notifyItemRemoved(mTiles.size() - 1); notifyItemRemoved(mTiles.size());
} }
} }
@@ -415,6 +412,8 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
private <T> void move(int from, int to, List<T> list) { private <T> void move(int from, int to, List<T> list) {
list.add(from > to ? to : to + 1, list.get(from)); list.add(from > to ? to : to + 1, list.get(from));
list.remove(from > to ? from + 1 : from); list.remove(from > to ? from + 1 : from);
notifyItemMoved(from, to);
notifyItemChanged(to);
} }
public class Holder extends ViewHolder { public class Holder extends ViewHolder {
@@ -429,6 +428,14 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
} }
} }
public void clearDrag() {
itemView.clearAnimation();
mTileView.findViewById(R.id.tile_label).clearAnimation();
mTileView.findViewById(R.id.tile_label).setAlpha(1);
mTileView.getAppLabel().clearAnimation();
mTileView.getAppLabel().setAlpha(.6f);
}
public void startDrag() { public void startDrag() {
itemView.animate() itemView.animate()
.setDuration(DRAG_LENGTH) .setDuration(DRAG_LENGTH)