Merge "Merge "Set large screen smallest screen width to 600" into udc-dev am:... (d291da26) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -3343,6 +3343,7 @@ package android.view {
		field public static final int DISPLAY_IME_POLICY_FALLBACK_DISPLAY = 1; // 0x1
		field public static final int DISPLAY_IME_POLICY_HIDE = 2; // 0x2
		field public static final int DISPLAY_IME_POLICY_LOCAL = 0; // 0x0
		field public static final int LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP = 600; // 0x258
		}

		public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {

core/java/android/view/WindowManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -816,6 +816,15 @@ public interface WindowManager extends ViewManager {
		int SCREENSHOT_VENDOR_GESTURE = 6;
		}

		/**
		* If the display {@link Configuration#smallestScreenWidthDp} is greater or equal to this value,
		* we will treat it as a large screen device, which will have some multi window features enabled
		* by default.
		* @hide
		*/
		@TestApi
		int LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP = 600;

		/**
		* Application level {@link android.content.pm.PackageManager.Property PackageManager
		* .Property} for an app to inform the system that the app can be opted-in or opted-out

core/res/res/values/config.xml

+4 −9

Original line number	Diff line number	Diff line
		@@ -3988,7 +3988,7 @@
		<!-- Whether the device supports non-resizable activity in multi windowing modes.
		-1: The device doesn't support non-resizable in multi windowing modes.
		0: The device supports non-resizable in multi windowing modes only if this is a large
		screen (smallest width >= {@link config_largeScreenSmallestScreenWidthDp}).
		screen (smallest width >= {@link WindowManager#LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP}).
		1: The device always supports non-resizable in multi windowing modes.
		-->
		<integer name="config_supportsNonResizableMultiWindow">0</integer>
		@@ -3998,9 +3998,9 @@
		-1: The device ignores the activity min width/height when determining if it can be shown in
		multi windowing modes.
		0: If this is a small screen (smallest width <
		{@link config_largeScreenSmallestScreenWidthDp}), the device compares the activity min
		width/height with the min multi windowing modes dimensions the device supports to
		determine if the activity can be shown in multi windowing modes
		{@link WindowManager#LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP}), the device compares the
		activity min width/height with the min multi windowing modes dimensions the device
		supports to determine if the activity can be shown in multi windowing modes
		1: The device always compare the activity min width/height with the min multi windowing
		modes dimensions {@link config_minPercentageMultiWindowSupportWidth} the device
		supports to determine if the activity can be shown in multi windowing modes.
		@@ -4023,11 +4023,6 @@
		-->
		<item name="config_minPercentageMultiWindowSupportWidth" format="float" type="dimen">0.5</item>

		<!-- If the display smallest screen width is greater or equal to this value, we will treat it
		as a large screen device, which will have some multi window features enabled by default.
		-->
		<integer name="config_largeScreenSmallestScreenWidthDp">600</integer>

		<!-- True if the device is using legacy split. -->
		<bool name="config_useLegacySplit">false</bool>

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -405,7 +405,6 @@
		<java-symbol type="integer" name="config_respectsActivityMinWidthHeightMultiWindow" />
		<java-symbol type="dimen" name="config_minPercentageMultiWindowSupportHeight" />
		<java-symbol type="dimen" name="config_minPercentageMultiWindowSupportWidth" />
		<java-symbol type="integer" name="config_largeScreenSmallestScreenWidthDp" />
		<java-symbol type="bool" name="config_useLegacySplit" />
		<java-symbol type="bool" name="config_noHomeScreen" />
		<java-symbol type="bool" name="config_supportsSystemDecorsOnSecondaryDisplays" />

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -7937,7 +7937,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}

		return getTask().getConfiguration().smallestScreenWidthDp
		>= mAtmService.mLargeScreenSmallestScreenWidthDp;
		>= WindowManager.LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP;
		}

		/**