Merge "Close Taskbar AllApps when going from overview to home" into tm-qpr-dev am: 7c323889aa

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

Change-Id: I1ff479f7475d613ee36aa94ecca42620b47465aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-18 21:31:35 +00:00
committed by Automerger Merge Worker

View File

@@ -258,8 +258,9 @@ import java.util.StringJoiner;
}
private Animator onStateChangeApplied(int changedFlags, long duration, boolean start) {
boolean goingToLauncher = isInLauncher();
final boolean goingToLauncher = isInLauncher();
final float toAlignment = isIconAlignedWithHotseat() ? 1 : 0;
boolean handleOpenFloatingViews = false;
if (DEBUG) {
Log.d(TAG, "onStateChangeApplied - mState: " + getStateString(mState)
+ ", changedFlags: " + getStateString(changedFlags)
@@ -280,6 +281,10 @@ import java.util.StringJoiner;
updateStateForFlag(FLAG_RESUMED, false);
applyState(0 /* duration */);
}
if (mLauncherState == LauncherState.NORMAL) {
// We're changing state to home, should close open popups e.g. Taskbar AllApps
handleOpenFloatingViews = true;
}
}
if (hasAnyFlag(changedFlags, FLAGS_LAUNCHER)) {
@@ -303,10 +308,11 @@ import java.util.StringJoiner;
}
});
if (goingToLauncher) {
// Handle closing open popups when going home/overview
AbstractFloatingView.closeAllOpenViews(mControllers.taskbarActivityContext);
}
// Handle closing open popups when going home/overview
handleOpenFloatingViews = true;
}
if (handleOpenFloatingViews && goingToLauncher) {
AbstractFloatingView.closeAllOpenViews(mControllers.taskbarActivityContext);
}
float backgroundAlpha =