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

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

Merge "Default value for DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW" into sc-dev

parents 52b00332 7ac5c26f

packages/SettingsProvider/res/values/defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -249,4 +249,7 @@ 


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

    <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>

</resources>

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+19 −1
Original line number Diff line number Diff line
@@ -3342,7 +3342,7 @@ public class SettingsProvider extends ContentProvider { 
        }



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 197;

            private static final int SETTINGS_VERSION = 198;



            private final int mUserId;
@@ -4815,6 +4815,24 @@ public class SettingsProvider extends ContentProvider { 
                    currentVersion = 197;

                }



                if (currentVersion == 197) {

                    // Version 197: Set the default value for Global Settings:

                    // DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW

                    final SettingsState globalSettings = getGlobalSettingsLocked();

                    final Setting enableNonResizableMultiWindow = globalSettings.getSettingLocked(

                            Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW);

                    if (enableNonResizableMultiWindow.isNull()) {

                        final boolean defEnableNonResizableMultiWindow = getContext().getResources()

                                .getBoolean(R.bool.def_enable_non_resizable_multi_window);

                        globalSettings.insertSettingLocked(

                                Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW,

                                defEnableNonResizableMultiWindow ? "1" : "0", null, true,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                    }



                    currentVersion = 198;

                }



                // vXXX: Add new settings above this point.



                if (currentVersion != newVersion) {