openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temporary fix to disable task#onClickListener during transition to overview 

The root cause is InputConsumerProxy not getting events during the transition. Will need to investigate more, but since we dont allow interaction with TaskView during the transition currently, apply this temporary fix to unblock

Bug: 175039524
Test: manual
Change-Id: Ifc3eb0569cf3a60d193e91bf70519a0737afb90a
This commit is contained in:
Tracy Zhou 2021-01-26 16:16:29 -08:00
parent f1db62cc98
commit 15b0f700fe
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
View File

@ -970,6 +970,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
}
duration = Math.max(duration, mRecentsView.getScroller().getDuration());
}
if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(false);
}
}
// Let RecentsView handle the scrolling to the task, which we launch in startNewTask()
@ -1447,6 +1450,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
private void finishCurrentTransitionToRecents() {
if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(true);
} else if (!hasTargets() || mRecentsAnimationController == null) {
// If there are no targets or the animation not started, then there is nothing to finish
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

12
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@ -257,6 +257,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
private final float[] mIconCenterCoords = new float[2];
private final float[] mChipCenterCoords = new float[2];
private boolean mIsClickableAsLiveTile = true;
public TaskView(Context context) {
this(context, null);
}
@ -273,6 +275,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
return;
}
if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
if (!mIsClickableAsLiveTile) {
return;
}
mIsClickableAsLiveTile = false;
RecentsView recentsView = getRecentsView();
RemoteAnimationTargets targets = recentsView.getLiveTileParams().getTargetSet();
recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(false);
@ -289,6 +296,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
public void onAnimationEnd(Animator animator) {
recentsView.getLiveTileTaskViewSimulator().setDrawsBelowRecents(true);
recentsView.finishRecentsAnimation(false, null);
mIsClickableAsLiveTile = true;
}
});
anim.start();
@ -348,6 +356,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
return false;
}
public void setIsClickableAsLiveTile(boolean isClickableAsLiveTile) {
mIsClickableAsLiveTile = isClickableAsLiveTile;
}
private void computeAndSetIconTouchDelegate() {
float iconHalfSize = mIconView.getWidth() / 2f;
mIconCenterCoords[0] = mIconCenterCoords[1] = iconHalfSize;