mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-17 17:48:20 +00:00
Merge "Fix transition animations for launch-from-staged operation" into tm-qpr-dev am: 9dfeb03a71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20844441 Change-Id: Ie382a53ed107537f52e8bc8777468f52a4288ae9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3040,7 +3040,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
false /* fadeWithThumbnail */, true /* isStagedTask */);
|
||||
}
|
||||
|
||||
// TODO (b/257513449): Launch animation not fully complete. OK to remove flag once it is.
|
||||
// Allow user to click staged app to launch into fullscreen
|
||||
if (ENABLE_LAUNCH_FROM_STAGED_APP.get()) {
|
||||
mFirstFloatingTaskView.setOnClickListener(this::animateToFullscreen);
|
||||
}
|
||||
@@ -3111,7 +3111,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
false /* fadeWithThumbnail */,
|
||||
true /* isStagedTask */);
|
||||
|
||||
pendingAnimation.addEndListener(success -> launchStagedTask());
|
||||
pendingAnimation.addEndListener(animationSuccess ->
|
||||
mSplitSelectStateController.launchSplitTasks(launchSuccess ->
|
||||
resetFromSplitSelectionState()));
|
||||
|
||||
pendingAnimation.buildAnim().start();
|
||||
}
|
||||
@@ -4818,16 +4820,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
return mPendingAnimation;
|
||||
}
|
||||
|
||||
protected void launchStagedTask() {
|
||||
if (mSplitHiddenTaskView != null) {
|
||||
// Split staging was started from an existing running task (in Overview)
|
||||
mSplitHiddenTaskView.launchTask(success -> resetFromSplitSelectionState());
|
||||
} else {
|
||||
// Split staging was started from a new intent (from app menu in Home/AllApps)
|
||||
mActivity.startActivity(mSplitSelectSource.intent);
|
||||
}
|
||||
}
|
||||
|
||||
protected void onTaskLaunchAnimationEnd(boolean success) {
|
||||
if (success) {
|
||||
resetTaskVisuals();
|
||||
|
||||
@@ -364,7 +364,7 @@ public final class FeatureFlags {
|
||||
"ENABLE_DEVICE_PROFILE_LOGGING", false, "Allows DeviceProfile logging");
|
||||
|
||||
public static final BooleanFlag ENABLE_LAUNCH_FROM_STAGED_APP = getDebugFlag(
|
||||
"ENABLE_LAUNCH_FROM_STAGED_APP", false,
|
||||
"ENABLE_LAUNCH_FROM_STAGED_APP", true,
|
||||
"Enable the ability to tap a staged app during split select to launch it in full screen"
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user