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

Commit 53d99836 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 26c00dec: am b2d3904b: Merge "Setting the default value for dock audio" 

* commit '26c00dec':
  Setting the default value for dock audio
parents 449f006f 26c00dec

packages/SettingsProvider/res/values/defaults.xml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 


    <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
@@ -2213,6 +2213,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadStringSetting(stmt, Settings.Global.WIRELESS_CHARGING_STARTED_SOUND,

                    R.string.def_wireless_charging_started_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);