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

Merge "Do not disappear text when moving tiles" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-01 15:01:20 +00:00
committed by Android (Google) Code Review
parent 78774b577d 5a428fb90e
commit 285aee4a3a
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,6 +291,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
@Override @Override
public boolean onFailedToRecycleView(Holder holder) { public boolean onFailedToRecycleView(Holder holder) {
holder.stopDrag();
holder.clearDrag(); holder.clearDrag();
return true; return true;
} }
@@ -565,12 +566,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
public void clearDrag() { public void clearDrag() {
itemView.clearAnimation(); itemView.clearAnimation();
if (mTileView instanceof CustomizeTileView) {
mTileView.findViewById(R.id.tile_label).clearAnimation();
mTileView.findViewById(R.id.tile_label).setAlpha(1);
mTileView.getSecondaryLabel().clearAnimation();
mTileView.getSecondaryLabel().setAlpha(.6f);
}
} }
public void startDrag() { public void startDrag() {
@@ -578,14 +573,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
.setDuration(DRAG_LENGTH) .setDuration(DRAG_LENGTH)
.scaleX(DRAG_SCALE) .scaleX(DRAG_SCALE)
.scaleY(DRAG_SCALE); .scaleY(DRAG_SCALE);
if (mTileView instanceof CustomizeTileView) {
mTileView.findViewById(R.id.tile_label).animate()
.setDuration(DRAG_LENGTH)
.alpha(0);
mTileView.getSecondaryLabel().animate()
.setDuration(DRAG_LENGTH)
.alpha(0);
}
} }
public void stopDrag() { public void stopDrag() {
@@ -593,14 +580,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
.setDuration(DRAG_LENGTH) .setDuration(DRAG_LENGTH)
.scaleX(1) .scaleX(1)
.scaleY(1); .scaleY(1);
if (mTileView instanceof CustomizeTileView) {
mTileView.findViewById(R.id.tile_label).animate()
.setDuration(DRAG_LENGTH)
.alpha(1);
mTileView.getSecondaryLabel().animate()
.setDuration(DRAG_LENGTH)
.alpha(.6f);
}
} }
boolean canRemove() { boolean canRemove() {