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

Commit 68fcf43c authored by Lucas Silva's avatar Lucas Silva
Browse files

Default dream trigger to postured 

The current default is that dreams are enabled by default but only
enabled "while docked". On devices that support posturing, we will
switch the default to be "while postured" and disable the main dream
toggle to maintain existing behavior of the dream not being enabled.

If the user has switched their setting to "while charging", no changes
will be made.

Bug: 383208131
Test: flashed change with wiping device and without wiping device, to
ensure the upgrade works correctly in both scenarios.
Flag: EXEMPT settings database upgrade

Change-Id: Idba32d9a83b163ae0a3d156c12849c584290c63e
parent 53d05392

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

+46 −1
Original line number Diff line number Diff line
@@ -4072,7 +4072,7 @@ public class SettingsProvider extends ContentProvider { 


        @VisibleForTesting

        final class UpgradeController {

            private static final int SETTINGS_VERSION = 226;

            private static final int SETTINGS_VERSION = 227;



            private final int mUserId;
@@ -6266,6 +6266,51 @@ public class SettingsProvider extends ContentProvider { 
                    currentVersion = 226;

                }



                // Version 226: Introduces dreaming while postured setting and migrates user from

                // docked dream trigger to postured dream trigger.

                if (currentVersion == 226) {

                    final SettingsState secureSettings = getSecureSettingsLocked(userId);

                    final Setting dreamOnDock = secureSettings.getSettingLocked(

                            Secure.SCREENSAVER_ACTIVATE_ON_DOCK);

                    final Setting dreamsEnabled = secureSettings.getSettingLocked(

                            Secure.SCREENSAVER_ENABLED);

                    final boolean dreamOnPosturedDefault = getContext().getResources().getBoolean(

                            com.android.internal.R.bool.config_dreamsActivatedOnPosturedByDefault);

                    final boolean dreamsEnabledByDefault = getContext().getResources().getBoolean(

                            com.android.internal.R.bool.config_dreamsEnabledByDefault);



                    if (dreamOnPosturedDefault && !dreamOnDock.isNull()

                            && dreamOnDock.getValue().equals("1")) {

                        // Disable dock activation and enable postured.

                        secureSettings.insertSettingOverrideableByRestoreLocked(

                                Secure.SCREENSAVER_ACTIVATE_ON_DOCK,

                                "0",

                                null,

                                true,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                        secureSettings.insertSettingOverrideableByRestoreLocked(

                                Secure.SCREENSAVER_ACTIVATE_ON_POSTURED,

                                "1",

                                null,

                                true,

                                SettingsState.SYSTEM_PACKAGE_NAME);



                        // Disable dreams overall, so user doesn't start to unexpectedly see dreams

                        // enabled when postured.

                        if (!dreamsEnabledByDefault && !dreamsEnabled.isNull()

                                && dreamsEnabled.getValue().equals("1")) {

                            secureSettings.insertSettingOverrideableByRestoreLocked(

                                    Secure.SCREENSAVER_ENABLED,

                                    "0",

                                    null,

                                    true,

                                    SettingsState.SYSTEM_PACKAGE_NAME);

                        }

                    }



                    currentVersion = 227;

                }



                // vXXX: Add new settings above this point.



                if (currentVersion != newVersion) {