Snap for 10557896 from 98be6f496d469a89ebd77fce93cf9a74386c0132 to udc-qpr1-release (b53225f2) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,16 @@ public final class ViewRootImpl implements ViewParent,
		public static final boolean CLIENT_TRANSIENT =
		SystemProperties.getBoolean("persist.wm.debug.client_transient", false);

		/**
		* Whether the client (system UI) is handling the immersive confirmation window. If
		* {@link CLIENT_TRANSIENT} is set to true, the immersive confirmation window will always be the
		* client instance and this flag will be ignored. Otherwise, the immersive confirmation window
		* can be switched freely by this flag.
		* @hide
		*/
		public static final boolean CLIENT_IMMERSIVE_CONFIRMATION =
		SystemProperties.getBoolean("persist.wm.debug.client_immersive_confirmation", false);

		/**
		* Whether the client should compute the window frame on its own.
		* @hide

core/java/android/view/WindowManager.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -3098,6 +3098,16 @@ public interface WindowManager extends ViewManager {
		*/
		public static final int PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE = 1 << 16;

		/**
		* Flag to indicate that this window is a immersive mode confirmation window. The window
		* should be ignored when calculating insets control. This is used for prompt window
		* triggered by insets visibility changes. If it can take over the insets control, the
		* visibility will change unexpectedly and the window may dismiss itself. Power button panic
		* handling will be disabled when this window exists.
		* @hide
		*/
		public static final int PRIVATE_FLAG_IMMERSIVE_CONFIRMATION_WINDOW = 1 << 17;

		/**
		* Flag to indicate that any window added by an application process that is of type
		* {@link #TYPE_TOAST} or that requires
		@@ -3242,6 +3252,7 @@ public interface WindowManager extends ViewManager {
		PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME,
		PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS,
		PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE,
		PRIVATE_FLAG_IMMERSIVE_CONFIRMATION_WINDOW,
		SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,
		PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY,
		PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION,
		@@ -3325,6 +3336,10 @@ public interface WindowManager extends ViewManager {
		mask = PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE,
		equals = PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE,
		name = "SUSTAINED_PERFORMANCE_MODE"),
		@ViewDebug.FlagToString(
		mask = PRIVATE_FLAG_IMMERSIVE_CONFIRMATION_WINDOW,
		equals = PRIVATE_FLAG_IMMERSIVE_CONFIRMATION_WINDOW,
		name = "IMMERSIVE_CONFIRMATION_WINDOW"),
		@ViewDebug.FlagToString(
		mask = SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,
		equals = SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

core/java/com/android/internal/app/ResolverActivity.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_PERS
		import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PROFILE_NOT_SUPPORTED;
		import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB;
		import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB_ACCESSIBILITY;
		import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
		import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
		import static android.content.PermissionChecker.PID_UNKNOWN;
		import static android.stats.devicepolicy.nano.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_PERSONAL;
		@@ -356,6 +357,12 @@ public class ResolverActivity extends Activity implements
		// flag set, we are now losing it. That should be a very rare case
		// and we can live with this.
		intent.setFlags(intent.getFlags()&~Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

		// If FLAG_ACTIVITY_LAUNCH_ADJACENT was set, ResolverActivity was opened in the alternate
		// side, which means we want to open the target app on the same side as ResolverActivity.
		if ((intent.getFlags() & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0) {
		intent.setFlags(intent.getFlags() & ~FLAG_ACTIVITY_LAUNCH_ADJACENT);
		}
		return intent;
		}

core/java/com/android/internal/statusbar/IStatusBar.aidl

+13 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,19 @@ oneway interface IStatusBar
		void cancelPreloadRecentApps();
		void showScreenPinningRequest(int taskId);

		/**
		* Notify system UI the immersive prompt should be dismissed as confirmed, and the confirmed
		* status should be saved without user clicking on the button. This could happen when a user
		* swipe on the edge with the confirmation prompt showing.
		*/
		void confirmImmersivePrompt();

		/**
		* Notify system UI the immersive mode changed. This shall be removed when client immersive is
		* enabled.
		*/
		void immersiveModeChanged(int rootDisplayAreaId, boolean isImmersiveMode);

		void dismissKeyboardShortcutsMenu();
		void toggleKeyboardShortcutsMenu(int deviceId);

core/res/res/values/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -5718,6 +5718,9 @@
		<!-- Whether per-app user aspect ratio override settings is enabled -->
		<bool name="config_appCompatUserAppAspectRatioSettingsIsEnabled">false</bool>

		<!-- Whether per-app fullscreen override option is allowed in user aspect ratio settings -->
		<bool name="config_appCompatUserAppAspectRatioFullscreenIsEnabled">false</bool>

		<!-- Whether sending compat fake focus for split screen resumed activities is enabled.
		Needed because some game engines wait to get focus before drawing the content of
		the app which isn't guaranteed by default in multi-window modes. -->