Snap for 12243189 from 2ff4120877f721a6d964bbf493c6e6f95257de65 to 24Q4-release (bb6d6e51) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -14953,6 +14953,7 @@ public final class Settings {
		*
		* @hide
		*/
		@Readable
		public static final String MUTE_ALARM_STREAM_WITH_RINGER_MODE =
		"mute_alarm_stream_with_ringer_mode";

core/java/com/android/internal/policy/PhoneWindow.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		mElevation = preservedWindow.getElevation();
		mLoadElevation = false;
		mForceDecorInstall = true;
		mDecorFitsSystemWindows = preservedWindow.decorFitsSystemWindows();
		setSystemBarAppearance(preservedWindow.getSystemBarAppearance());
		// If we're preserving window, carry over the app token from the preserved
		// window, as we'll be skipping the addView in handleResumeActivity(), and

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/split/SplitScreenConstants.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ public class SplitScreenConstants {
		/** Duration used for every split fade-in or fade-out. */
		public static final int FADE_DURATION = 133;
		/** Duration where we keep an app veiled to allow it to redraw itself behind the scenes. */
		public static final int VEIL_DELAY_DURATION = 400;
		public static final int VEIL_DELAY_DURATION = 300;

		/** Key for passing in widget intents when invoking split from launcher workspace. */
		public static final String KEY_EXTRA_WIDGET_INTENT = "key_extra_widget_intent";

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+12 −7

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import static android.view.WindowManager.DOCKED_TOP;
		import static com.android.internal.jank.InteractionJankMonitor.CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER;
		import static com.android.internal.jank.InteractionJankMonitor.CUJ_SPLIT_SCREEN_RESIZE;
		import static com.android.wm.shell.shared.animation.Interpolators.DIM_INTERPOLATOR;
		import static com.android.wm.shell.shared.animation.Interpolators.EMPHASIZED;
		import static com.android.wm.shell.shared.animation.Interpolators.LINEAR;
		import static com.android.wm.shell.shared.animation.Interpolators.SLOWDOWN_INTERPOLATOR;
		import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_END_AND_DISMISS;
		import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_START_AND_DISMISS;
		@@ -813,7 +815,9 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		float growPortion = 1 - shrinkPortion;

		ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
		animator.setInterpolator(Interpolators.EMPHASIZED);
		// Set the base animation to proceed linearly. Each component of the animation (movement,
		// shrinking, growing) overrides it with a different interpolator later.
		animator.setInterpolator(LINEAR);
		animator.addUpdateListener(animation -> {
		if (leash == null) return;
		if (roundCorners) {
		@@ -822,10 +826,11 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		}

		final float progress = (float) animation.getAnimatedValue();
		float instantaneousX = tempStart.left + progress * diffX;
		float instantaneousY = tempStart.top + progress * diffY;
		int width = (int) (tempStart.width() + progress * diffWidth);
		int height = (int) (tempStart.height() + progress * diffHeight);
		final float moveProgress = EMPHASIZED.getInterpolation(progress);
		float instantaneousX = tempStart.left + moveProgress * diffX;
		float instantaneousY = tempStart.top + moveProgress * diffY;
		int width = (int) (tempStart.width() + moveProgress * diffWidth);
		int height = (int) (tempStart.height() + moveProgress * diffHeight);

		if (isGoingBehind) {
		float shrinkDiffX; // the position adjustments needed for this frame
		@@ -897,8 +902,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		taskInfo, mTempRect, t, isGoingBehind, leash, 0, 0);
		}
		} else {
		final int diffOffsetX = (int) (progress * offsetX);
		final int diffOffsetY = (int) (progress * offsetY);
		final int diffOffsetX = (int) (moveProgress * offsetX);
		final int diffOffsetY = (int) (moveProgress * offsetY);
		t.setPosition(leash, instantaneousX + diffOffsetX, instantaneousY + diffOffsetY);
		mTempRect.set(0, 0, width, height);
		mTempRect.offsetTo(-diffOffsetX, -diffOffsetY);

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -304,6 +304,7 @@ public abstract class WMShellModule {
		ShellInit shellInit,
		ShellTaskOrganizer shellTaskOrganizer,
		Optional<DesktopModeTaskRepository> desktopModeTaskRepository,
		LaunchAdjacentController launchAdjacentController,
		WindowDecorViewModel windowDecorViewModel) {
		// TODO(b/238217847): Temporarily add this check here until we can remove the dynamic
		// override for this controller from the base module
		@@ -311,7 +312,7 @@ public abstract class WMShellModule {
		? shellInit
		: null;
		return new FreeformTaskListener(context, init, shellTaskOrganizer,
		desktopModeTaskRepository, windowDecorViewModel);
		desktopModeTaskRepository, launchAdjacentController, windowDecorViewModel);
		}

		@WMSingleton