diff options
| author | 2021-02-08 11:45:54 -0800 | |
|---|---|---|
| committer | 2021-02-08 19:35:11 -0800 | |
| commit | 781f23c99c743b472d865a813bb05617f9c07a5f (patch) | |
| tree | 19dbd25cc5f624e265fd09992777bac72a7c1f2b | |
| parent | 123247e2d8ee27f5db9bf270e17e7d4c2735fb3f (diff) | |
Enable non resizable app in multi window by default
Devices that have already got the default setting will need to do a
factory reset to get the new default value.
Also change the default value when the setting is empty for catching
test failures.
Bug: 176061101
Test: manual
Change-Id: Ibf260986ddb4b7a6e06ddf20153e49d9e2df96a4
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 4bcef408d9a0..e55704763659 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -771,7 +771,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 a41761f529be..396c3b7bd326 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -975,7 +975,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; } |