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

Commit 234f6fca authored by Song Chun Fan's avatar Song Chun Fan Committed by Gerrit Code Review
Browse files

Merge "Add settings default handling for STATUS_BAR_SHOW_VIBRATE_ICON"

parents fc96f8b5 8852a101

packages/SettingsProvider/res/values/defaults.xml

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


    <!-- Whether tilt to bright is enabled by default. -->

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



    <!-- Whether vibrate icon is shown in the status bar by default. -->

    <integer name="def_statusBarVibrateIconEnabled">0</integer>

</resources>

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

+12 −2
Original line number Diff line number Diff line
@@ -3631,7 +3631,7 @@ public class SettingsProvider extends ContentProvider { 
        }



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 210;

            private static final int SETTINGS_VERSION = 211;



            private final int mUserId;
@@ -5512,7 +5512,17 @@ public class SettingsProvider extends ContentProvider { 
                    // removed now that feature is enabled for everyone

                    currentVersion = 210;

                }



                if (currentVersion == 210) {

                    final SettingsState secureSettings = getSecureSettingsLocked(userId);

                    final int defaultValueVibrateIconEnabled = getContext().getResources()

                            .getInteger(R.integer.def_statusBarVibrateIconEnabled);

                    secureSettings.insertSettingOverrideableByRestoreLocked(

                            Secure.STATUS_BAR_SHOW_VIBRATE_ICON,

                            String.valueOf(defaultValueVibrateIconEnabled),

                            null /* tag */, true /* makeDefault */,

                            SettingsState.SYSTEM_PACKAGE_NAME);

                    currentVersion = 211;

                }

                // vXXX: Add new settings above this point.



                if (currentVersion != newVersion) {