Cover thumbnail view instead of TaskView for split animation
Fixes: 219622592 Test: Slowed down animation and verified same as before refactor was done. Change-Id: Iec8dc9ea1d7925575c3a3b84e12653829a00d8dd
This commit is contained in:
@@ -2723,8 +2723,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
if (mSplitHiddenTaskView != null) {
|
||||
mSplitHiddenTaskView.setVisibility(INVISIBLE);
|
||||
mFirstFloatingTaskView = FloatingTaskView.getFloatingTaskView(mActivity,
|
||||
mSplitHiddenTaskView, mSplitHiddenTaskView.getThumbnail().getThumbnail(),
|
||||
mSplitHiddenTaskView.getIconView().getDrawable(), startingTaskRect);
|
||||
mSplitHiddenTaskView.getThumbnail(),
|
||||
mSplitHiddenTaskView.getThumbnail().getThumbnail(),
|
||||
mSplitHiddenTaskView.getIconView().getDrawable(), startingTaskRect,
|
||||
floatingTaskViewStartingPosition -> floatingTaskViewStartingPosition.offset(
|
||||
mSplitHiddenTaskView.getTranslationX(),
|
||||
mSplitHiddenTaskView.getTranslationY()
|
||||
));
|
||||
mFirstFloatingTaskView.setAlpha(1);
|
||||
mFirstFloatingTaskView.addAnimation(anim, startingTaskRect,
|
||||
mTempRect, mSplitHiddenTaskView, true /*fadeWithThumbnail*/);
|
||||
@@ -2732,7 +2737,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
mSplitSelectSource.view.setVisibility(INVISIBLE);
|
||||
mFirstFloatingTaskView = FloatingTaskView.getFloatingTaskView(mActivity,
|
||||
mSplitSelectSource.view, null,
|
||||
mSplitSelectSource.drawable, startingTaskRect);
|
||||
mSplitSelectSource.drawable, startingTaskRect, null /*additionalOffsetter*/);
|
||||
mFirstFloatingTaskView.setAlpha(1);
|
||||
mFirstFloatingTaskView.addAnimation(anim, startingTaskRect,
|
||||
mTempRect, mSplitSelectSource.view, true /*fadeWithThumbnail*/);
|
||||
@@ -4023,8 +4028,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
false /*fadeWithThumbnail*/);
|
||||
|
||||
mSecondFloatingTaskView = FloatingTaskView.getFloatingTaskView(mActivity,
|
||||
taskView, taskView.getThumbnail().getThumbnail(),
|
||||
taskView.getIconView().getDrawable(), secondTaskStartingBounds);
|
||||
taskView.getThumbnail(), taskView.getThumbnail().getThumbnail(),
|
||||
taskView.getIconView().getDrawable(), secondTaskStartingBounds,
|
||||
floatingTaskViewStartingPosition -> floatingTaskViewStartingPosition.offset(
|
||||
taskView.getTranslationX(),
|
||||
taskView.getTranslationY()
|
||||
));
|
||||
mSecondFloatingTaskView.setAlpha(1);
|
||||
mSecondFloatingTaskView.addAnimation(pendingAnimation, secondTaskStartingBounds,
|
||||
secondTaskEndingBounds, taskView.getThumbnail(),
|
||||
|
||||
Reference in New Issue
Block a user