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

Commit 2827f507 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Enable non resizable app in multi window by default" into sc-dev

parents 4db015d0 781f23c9

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
@@ -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);

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

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

        }