Refine animation to remove strange reshuffling animation
The issue happens mainly because two animations(move + change) running on the same view interrupt with each other. When ItemAnimator runs the move animation, it will change the translationX&Y in a time period. When the change animation occurs in this period, it gets this translation value and calculates a non-zero deta, then it would run an unnecessary move animation, which causes the strange reshuffling. In this cl, I skip the translation value only for the tile view when there is pending animation. I also add scroll operation for conditions view to make it scroll to top after condition change. Bug: 33839777 Bug: 33839780 Test: make -j40 RunSettingsRoboTests Change-Id: I2152f93f756ae20cf754d6fca3525119cb4ceb1f
This commit is contained in:
@@ -18,15 +18,22 @@ package com.android.settings.dashboard;
|
||||
import android.support.v4.view.ViewCompat;
|
||||
import android.support.v7.widget.DefaultItemAnimator;
|
||||
import android.support.v7.widget.RecyclerView.ViewHolder;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
|
||||
public class DashboardItemAnimator extends DefaultItemAnimator {
|
||||
|
||||
@Override
|
||||
public boolean animateChange(ViewHolder oldHolder, ViewHolder newHolder, int fromX, int fromY,
|
||||
int toX, int toY) {
|
||||
if (oldHolder == newHolder) {
|
||||
fromX += ViewCompat.getTranslationX(oldHolder.itemView);
|
||||
fromY += ViewCompat.getTranslationY(oldHolder.itemView);
|
||||
final Object tag = oldHolder.itemView.getTag();
|
||||
if (tag instanceof Tile && oldHolder == newHolder) {
|
||||
// When this view has other move animation running, skip this value to avoid
|
||||
// animations interrupt each other.
|
||||
if (!isRunning()) {
|
||||
fromX += ViewCompat.getTranslationX(oldHolder.itemView);
|
||||
fromY += ViewCompat.getTranslationY(oldHolder.itemView);
|
||||
}
|
||||
|
||||
if (fromX == toX && fromY == toY) {
|
||||
dispatchMoveFinished(oldHolder);
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user