Merge "Allow non-resizable apps in split-screen (1/n)" (6e1fcac5) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1648,6 +1648,7 @@ package android.provider {
		field public static final String APP_OPS_CONSTANTS = "app_ops_constants";
		field public static final String AUTOMATIC_POWER_SAVE_MODE = "automatic_power_save_mode";
		field public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants";
		field public static final String DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW = "enable_non_resizable_multi_window";
		field public static final String DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD = "dynamic_power_savings_disable_threshold";
		field public static final String DYNAMIC_POWER_SAVINGS_ENABLED = "dynamic_power_savings_enabled";
		field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";

+16 −0

Original line number	Diff line number	Diff line
		@@ -10436,12 +10436,28 @@ public final class Settings {

		/**
		* Whether to allow non-resizable apps to be freeform.
		*
		* TODO(b/176061101) remove after update all usages
		* @deprecated use {@link #DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW}
		* @hide
		*/
		@Deprecated
		@Readable
		public static final String DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM =
		"enable_sizecompat_freeform";

		/**
		* Whether to allow non-resizable apps to be shown in multi-window. The app will be
		* letterboxed if the request orientation is not met, and will be shown in size-compat
		* mode if the container size has changed.
		* @hide
		*/
		@TestApi
		@Readable
		@SuppressLint("NoSettingsProvider")
		public static final String DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW =
		"enable_non_resizable_multi_window";

		/**
		* If true, shadows drawn around the window will be rendered by the system compositor. If
		* false, shadows will be drawn by the client by setting an elevation on the root view and

+1 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,7 @@ message GlobalSettingsProto {
		optional SettingProto emulate_display_cutout = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto force_desktop_mode_on_external_displays = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto enable_sizecompat_freeform = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto enable_non_resizable_multi_window = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Development development = 39;

+3 −0

Original line number	Diff line number	Diff line
		@@ -553,6 +553,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM,
		GlobalSettingsProto.Development.ENABLE_SIZECOMPAT_FREEFORM);
		dumpSetting(s, p,
		Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW,
		GlobalSettingsProto.Development.ENABLE_NON_RESIZABLE_MULTI_WINDOW);
		p.end(developmentToken);

		final long deviceToken = p.start(GlobalSettingsProto.DEVICE);

+1 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,7 @@ public class SettingsBackupTest {
		Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
		Settings.Global.DEVELOPMENT_FORCE_RTL,
		Settings.Global.DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM,
		Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW,
		Settings.Global.DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_SV,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_VR,