PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reset state after split launch animation finishes" into sc-v2-dev am: 6ab0d1e7be

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15986152

Change-Id: Iac00a062f0f3531fa1d59cb2e2ade6b17e7cb73c
This commit is contained in:
Vinit Nayak
2021-10-06 01:14:28 +00:00
committed by Automerger Merge Worker
parent e77cae7f0d 6ab0d1e7be
commit c8b7fef784
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+2 -5
View File
@@ -163,10 +163,8 @@ public class SplitSelectStateController {
if (mSuccessCallback != null) { if (mSuccessCallback != null) {
mSuccessCallback.accept(true); mSuccessCallback.accept(true);
} }
resetState();
})); }));
// After successful launch, call resetState
resetState();
} }
@Override @Override
@@ -175,9 +173,8 @@ public class SplitSelectStateController {
if (mSuccessCallback != null) { if (mSuccessCallback != null) {
mSuccessCallback.accept(false); mSuccessCallback.accept(false);
} }
resetState();
}); });
resetState();
} }
} }
quickstep/src/com/android/quickstep/views/RecentsView.java
+5 -3
View File
@@ -3919,7 +3919,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
/** TODO(b/181707736) More gracefully handle exiting split selection state */ /** TODO(b/181707736) More gracefully handle exiting split selection state */
private void resetFromSplitSelectionState() { private void resetFromSplitSelectionState() {
mSplitHiddenTaskView.setTranslationY(0);
if (!showAsGrid()) { if (!showAsGrid()) {
int pageToSnapTo = mCurrentPage; int pageToSnapTo = mCurrentPage;
if (mSplitHiddenTaskViewIndex <= pageToSnapTo) { if (mSplitHiddenTaskViewIndex <= pageToSnapTo) {
@@ -3931,9 +3930,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
} }
onLayout(false /* changed */, getLeft(), getTop(), getRight(), getBottom()); onLayout(false /* changed */, getLeft(), getTop(), getRight(), getBottom());
resetTaskVisuals(); resetTaskVisuals();
mSplitHiddenTaskView.setVisibility(VISIBLE);
mSplitHiddenTaskView = null;
mSplitHiddenTaskViewIndex = -1; mSplitHiddenTaskViewIndex = -1;
if (mSplitHiddenTaskView != null) {
mSplitHiddenTaskView.setTranslationY(0);
mSplitHiddenTaskView.setVisibility(VISIBLE);
mSplitHiddenTaskView = null;
}
if (mFirstFloatingTaskView != null) { if (mFirstFloatingTaskView != null) {
mActivity.getRootView().removeView(mFirstFloatingTaskView); mActivity.getRootView().removeView(mFirstFloatingTaskView);
mFirstFloatingTaskView = null; mFirstFloatingTaskView = null;