Merge tag 'android-14.0.0_r28' into android-14.0.0_r28
Android 14.0.0 Release 28 (UP1A.231105.001.B2) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZcKIlAAKCRDorT+BmrEO # eBpvAJ4nxs3kcAIk4V/imBoX2pQFBOJYCACfUgnHI+9dgPBM5yKFzN/Hm/DhrDs= # =avdO # -----END PGP SIGNATURE----- # gpg: Signature made Wed Feb 7 03:29:24 2024 CST # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Can't check signature: No public key # Conflicts: # lawnchair/res/color/widgets_picker_scrim.xml # quickstep/src/com/android/launcher3/QuickstepTransitionManager.java # quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java # quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java # quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java # quickstep/src/com/android/quickstep/TaskAnimationManager.java # quickstep/src/com/android/quickstep/TaskViewUtils.java # quickstep/src/com/android/quickstep/interaction/AllSetActivity.java # src/com/android/launcher3/config/FeatureFlags.java # src/com/android/launcher3/folder/LauncherDelegate.java
This commit is contained in:
commit
aa2f7086ea
12 files changed
+361
-281
No files matched your search
@@ -309,9 +309,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
|
||||
RunnableList onEndCallback = new RunnableList();
|
||||
|
||||
// Handle the case where an already visible task is launched which results in no
|
||||
// transition
|
||||
TaskRestartedDuringLaunchListener restartedListener = new TaskRestartedDuringLaunchListener();
|
||||
// Handle the case where an already visible task is launched which results in no transition
|
||||
TaskRestartedDuringLaunchListener restartedListener =
|
||||
new TaskRestartedDuringLaunchListener();
|
||||
restartedListener.register(onEndCallback::executeAllAndDestroy);
|
||||
onEndCallback.add(restartedListener::unregister);
|
||||
|
||||
@@ -1250,7 +1250,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
for (RemoteAnimationTarget target : targets) {
|
||||
if (target.mode == MODE_CLOSING) {
|
||||
numTargets++;
|
||||
if (numTargets > 1 || target.windowConfiguration.getWindowingMode() == WINDOWING_MODE_MULTI_WINDOW) {
|
||||
if (numTargets > 1 || target.windowConfiguration.getWindowingMode()
|
||||
== WINDOWING_MODE_MULTI_WINDOW) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1635,11 +1636,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
final boolean launcherIsForceInvisibleOrOpening = mLauncher.isForceInvisible()
|
||||
|| launcherIsATargetWithMode(appTargets, MODE_OPENING);
|
||||
|
||||
View launcherView = findLauncherView(appTargets);
|
||||
boolean playFallBackAnimation = (launcherView == null
|
||||
&& launcherIsForceInvisibleOrOpening)
|
||||
|| mLauncher.getWorkspace().isOverlayShown()
|
||||
|| shouldPlayFallbackClosingAnimation(appTargets);
|
||||
View launcherView = findLauncherView(appTargets);
|
||||
boolean playFallBackAnimation = (launcherView == null
|
||||
&& launcherIsForceInvisibleOrOpening)
|
||||
|| mLauncher.getWorkspace().isOverlayShown()
|
||||
|| shouldPlayFallbackClosingAnimation(appTargets);
|
||||
|
||||
boolean playWorkspaceReveal = true;
|
||||
boolean skipAllAppsScale = false;
|
||||
@@ -2094,7 +2095,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
setCrossWindowBlursEnabled(
|
||||
CrossWindowBlurListeners.getInstance().isCrossWindowBlurEnabled());
|
||||
}
|
||||
|
||||
// Make sure that the starting value matches the current depth set by the main
|
||||
// controller.
|
||||
stateDepth.setValue(launcher.getDepthController().stateDepth.getValue());
|
||||
|
||||
Reference in new issue
Block a user