Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 781f23c9 authored by Chris Li's avatar Chris Li
Browse files

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
parent 123247e2

packages/SettingsProvider/res/values/defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }