Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 614ef81..4ba0276 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3166,6 +3166,8 @@
InteractionJankMonitorWrapper.cancel(
InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER);
}
+
+ updateCurrentTaskActionsVisibility();
});
}
@@ -4666,6 +4668,11 @@
mSecondSplitHiddenView = null;
}
+ // We are leaving split selection state, so it is safe to reset thumbnail translations for
+ // the next time split is invoked.
+ setTaskViewsPrimarySplitTranslation(0);
+ setTaskViewsSecondarySplitTranslation(0);
+
if (mSplitHiddenTaskViewIndex == -1) {
return;
}
@@ -4680,11 +4687,6 @@
}
onLayout(false /* changed */, getLeft(), getTop(), getRight(), getBottom());
- // We are leaving split selection state, so it is safe to reset thumbnail translations for
- // the next time split is invoked.
- setTaskViewsPrimarySplitTranslation(0);
- setTaskViewsSecondarySplitTranslation(0);
-
resetTaskVisuals();
mSplitHiddenTaskViewIndex = -1;
if (mSplitHiddenTaskView != null) {