Snap for 11521484 from 7f8a7bfd8b8b64f1847634d06bae65c60cc830ac to 24Q2-release (75defe8d) · Commits · e / os / android_frameworks_base

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -4366,6 +4366,7 @@
		<java-symbol type="dimen" name="seekbar_thumb_exclusion_max_size" />
		<java-symbol type="layout" name="chooser_az_label_row" />
		<java-symbol type="string" name="chooser_all_apps_button_label" />
		<java-symbol type="anim" name="resolver_close_anim" />
		<java-symbol type="anim" name="resolver_launch_anim" />
		<java-symbol type="style" name="Animation.DeviceDefault.Activity.Resolver" />

+10 −2

Original line number	Diff line number	Diff line
		@@ -3515,7 +3515,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		return;
		}

		final int stageType = isMainStage ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;
		// If visible, we preserve the app and keep it running. If an app becomes
		// unsupported in the bg, break split without putting anything on top
		boolean splitScreenVisible = isSplitScreenVisible();
		int stageType = STAGE_TYPE_UNDEFINED;
		if (splitScreenVisible) {
		stageType = isMainStage ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;
		}
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		prepareExitSplitScreen(stageType, wct);
		clearSplitPairedInRecents(EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);
		@@ -3524,9 +3530,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		Log.w(TAG, splitFailureMessage("onNoLongerSupportMultiWindow",
		"app package " + taskInfo.baseActivity.getPackageName()
		+ " does not support splitscreen, or is a controlled activity type"));
		if (splitScreenVisible) {
		mSplitUnsupportedToast.show();
		}
		}
		}

		private void reset() {
		mHasRootTask = false;

+15 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ android_app {
		},

		static_libs: [
		"easter_egg_flags_lib",

		"androidx.core_core",
		"androidx.annotation_annotation",
		"androidx.recyclerview_recyclerview",
		@@ -72,3 +74,16 @@ android_app {

		kotlincflags: ["-Xjvm-default=all"],
		}

		java_aconfig_library {
		name: "easter_egg_flags_lib",
		aconfig_declarations: "easter_egg_flags",
		}

		aconfig_declarations {
		name: "easter_egg_flags",
		package: "com.android.egg.flags",
		srcs: [
		"easter_egg_flags.aconfig",
		],
		}

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		package: "com.android.egg.flags"

		flag {
		name: "flag_flag"
		namespace: "systemui"
		description: "Flags are planted on planets when you land. Yes, it's a flag for flags."
		bug: "320150798"
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,9 @@ open class Universe(val namer: Namer, randomSeed: Long) : Simulator(randomSeed)

		ship = Spacecraft()

		ship.pos = star.pos + Vec2.makeWithAngleMag(PIf / 4, PLANET_ORBIT_RANGE.start)
		// in the test universe, start the ship near the outermost planet
		ship.pos = planets.last().pos + Vec2(planets.first().radius * 1.5f, 0f)

		ship.angle = 0f
		add(ship)