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

Commit 002f3f1e authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Make default ringer mode configurable" into main

parents ea404728 3c53379e

packages/SettingsProvider/res/values/defaults.xml

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


    <!-- Value to use as default scale for fonts -->

    <item name="def_device_font_scale" format="float" type="dimen">1.0</item>



    <!-- The default ringer mode. See `AudioManager` for list of valid values. -->

    <integer name="def_ringer_mode">2</integer>

</resources>

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

+3 −1
Original line number Diff line number Diff line
@@ -3943,8 +3943,10 @@ public class SettingsProvider extends ContentProvider { 
                        globalSettings.updateSettingLocked(Settings.Global.ZEN_MODE,

                                Integer.toString(Settings.Global.ZEN_MODE_OFF), null,

                                true, SettingsState.SYSTEM_PACKAGE_NAME);

                        final int defaultRingerMode =

                                getContext().getResources().getInteger(R.integer.def_ringer_mode);

                        globalSettings.updateSettingLocked(Settings.Global.MODE_RINGER,

                                Integer.toString(AudioManager.RINGER_MODE_NORMAL), null,

                                Integer.toString(defaultRingerMode), null,

                                true, SettingsState.SYSTEM_PACKAGE_NAME);

                    }

                    currentVersion = 119;