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

Commit b2d3904b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Gerrit Code Review
Browse files

Merge "Setting the default value for dock audio"

parents 350d5168 729f6685

packages/SettingsProvider/res/values/defaults.xml

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
    <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>

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

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

    <integer name="def_dock_audio_media_enabled">1</integer>



    <!-- Notifications use ringer volume -->

    <bool name="def_notifications_use_ring_volume">true</bool>

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

+3 −0
Original line number Diff line number Diff line
@@ -2181,6 +2181,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadStringSetting(stmt, Settings.Global.CAR_UNDOCK_SOUND,

                    R.string.def_car_undock_sound);



            loadIntegerSetting(stmt, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,

                    R.integer.def_dock_audio_media_enabled);



            loadSetting(stmt, Settings.Global.SET_INSTALL_LOCATION, 0);

            loadSetting(stmt, Settings.Global.DEFAULT_INSTALL_LOCATION,

                    PackageHelper.APP_INSTALL_AUTO);