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

Commit de6bcfca authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Determine whether to support activities in multi window (7/n)" into sc-dev am: da438122 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14427494

Change-Id: I6aff9483c6599dc9a80e86c7122e4898a860011b
parents 0b9cf934 da438122

packages/SettingsProvider/res/values/defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ 
    <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">true</bool>

    <bool name="def_enable_non_resizable_multi_window">false</bool>



    <!-- Default for Settings.Secure.ACCESSIBILITY_BUTTON_MODE -->

    <integer name="def_accessibility_button_mode">1</integer>

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

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        final boolean forceResizable = Settings.Global.getInt(

                resolver, DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0;

        final boolean devEnableNonResizableMultiWindow = Settings.Global.getInt(

                resolver, DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 1) != 0;

                resolver, DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 0) != 0;

        final int supportsNonResizableMultiWindow = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_supportsNonResizableMultiWindow);

        final int respectsActivityMinWidthHeightMultiWindow = mContext.getResources().getInteger(

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

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        void updateDevEnableNonResizableMultiWindow() {

            ContentResolver resolver = mContext.getContentResolver();

            final boolean devEnableNonResizableMultiWindow = Settings.Global.getInt(resolver,

                    DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 1) != 0;

                    DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW, 0) != 0;



            mAtmService.mDevEnableNonResizableMultiWindow = devEnableNonResizableMultiWindow;

        }