Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Default value for DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW" into sc-dev

Browse Source
This commit is contained in:
Chris Li
2021-01-27 15:28:02 +00:00
committed by Android (Google) Code Review
parent 52b003326d 7ac5c26f92
commit 62f17faa91
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -249,4 +249,7 @@
<!-- Default for Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY --> <!-- Default for Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY -->
<integer name="def_accessibility_magnification_capabilities">3</integer> <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> </resources>

20
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -3342,7 +3342,7 @@ public class SettingsProvider extends ContentProvider {
} }
private final class UpgradeController { private final class UpgradeController {
private static final int SETTINGS_VERSION = 197; private static final int SETTINGS_VERSION = 198;
private final int mUserId; private final int mUserId;
@@ -4815,6 +4815,24 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 197; 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. // vXXX: Add new settings above this point.
if (currentVersion != newVersion) { if (currentVersion != newVersion) {