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

Commit 5a428fb9 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Do not disappear text when moving tiles 

Also, clear animation when tiles fail to recycle.

Fixes: 176699404
Fixes: 187909227
Test: Manual
Change-Id: I5cff76a6b65f3ae96e78cb01a025fa83612a6587
parent 28c48606

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