Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40bc375d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not disappear text when moving tiles" into sc-dev am: 285aee4a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14532268

Change-Id: Id1bab160a0ffb0e69a709c044a0fdf87fe59de64
parents 2a56bbc4 285aee4a

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

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


    @Override

    public boolean onFailedToRecycleView(Holder holder) {

        holder.stopDrag();

        holder.clearDrag();

        return true;

    }
@@ -565,12 +566,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta 


        public void clearDrag() {

            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() {
@@ -578,14 +573,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta 
                    .setDuration(DRAG_LENGTH)

                    .scaleX(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() {
@@ -593,14 +580,6 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta 
                    .setDuration(DRAG_LENGTH)

                    .scaleX(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() {