diff options
| author | 2021-02-10 00:51:02 +0000 | |
|---|---|---|
| committer | 2021-02-10 00:51:02 +0000 | |
| commit | 2827f5078361421145eed3aa36ed09651098c41c (patch) | |
| tree | 4863c9fcc9cee7bb656a393fc1c12213f118aebc | |
| parent | 4db015d00ed1b2f2f96f9a2bea4449c0680c37dd (diff) | |
| parent | 781f23c99c743b472d865a813bb05617f9c07a5f (diff) | |
Merge "Enable non resizable app in multi window by default" into sc-dev
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 84dacfdaa2e4..d10ff402aa3a 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -251,5 +251,5 @@ <integer name="def_accessibility_magnification_capabilities">3</integer> <!-- Default for Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW --> - <bool name="def_enable_non_resizable_multi_window">false</bool> + <bool name="def_enable_non_resizable_multi_window">true</bool> </resources> diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index f97af6259c9c..f16a646d00a1 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -788,7 +788,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final boolean sizeCompatFreeform = Settings.Global.getInt( resolver, DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM, 0) != 0; final boolean supportsNonResizableMultiWindow = Settings.Global.getInt( - resolver, DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 0) != 0; + resolver, DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 1) != 0; // Transfer any global setting for forcing RTL layout, into a System Property DisplayProperties.debug_force_rtl(forceRtl); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 23487252c91c..c54c9786c00d 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -977,7 +977,7 @@ public class WindowManagerService extends IWindowManager.Stub void updateSupportsNonResizableMultiWindow() { ContentResolver resolver = mContext.getContentResolver(); final boolean supportsNonResizableMultiWindow = Settings.Global.getInt(resolver, - DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 0) != 0; + DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 1) != 0; mAtmService.mSupportsNonResizableMultiWindow = supportsNonResizableMultiWindow; } |