Merge "Remove enabled flag disallow_app_progress_embedded_window" into main (ca7231f5) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -367,17 +367,6 @@ flag {
		}
		}

		flag {
		name: "disallow_app_progress_embedded_window"
		namespace: "windowing_frontend"
		description: "Pilfer pointers when app transfer input gesture to embedded window."
		bug: "365504126"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "predictive_back_system_override_callback"
		namespace: "windowing_frontend"

+2 −4

Original line number	Diff line number	Diff line
		@@ -111,10 +111,8 @@ class BackNavigationController {
		}

		void onEmbeddedWindowGestureTransferred(@NonNull WindowState host) {
		if (Flags.disallowAppProgressEmbeddedWindow()) {
		mNavigationMonitor.onEmbeddedWindowGestureTransferred(host);
		}
		}

		/**
		* Set up the necessary leashes and build a {@link BackNavigationInfo} instance for an upcoming
		@@ -215,7 +213,7 @@ class BackNavigationController {
		infoBuilder.setFocusedTaskId(currentTask.mTaskId);
		}
		boolean transferGestureToEmbedded = false;
		if (Flags.disallowAppProgressEmbeddedWindow() && embeddedWindows != null) {
		if (embeddedWindows != null) {
		for (int i = embeddedWindows.size() - 1; i >= 0; --i) {
		if (embeddedWindows.get(i).mGestureToEmbedded) {
		transferGestureToEmbedded = true;