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

Commit 53b4c29d authored by kaiyiz's avatar kaiyiz
Browse files

The default volume can't be overlaid from xml. 

Without headset or other extra devices, the volume will come
out from speaker of device. Then "*_speaker_volume" should be
stored into database, but there are no such items and the "*_volume"
can't work for default also. so we should add the corresponding
"*_speaker_volume" for customization.

Change-Id: Idb6bfcb9f02a48ae876d7ee7799fcb26f8c2b479
CRs-Fixed: 815661
parent 93fbee47

packages/SettingsProvider/res/values/customize.xml

+15 −0
Original line number Diff line number Diff line
@@ -77,9 +77,24 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    <!-- Ringtone speaker Volume,its value is from 0 to 7,default value is 5 -->

    <integer name="def_ringtone_speaker_volume" translatable="false">5</integer>



    <!-- Music speaker Volume,its value is from 0 to 15,default value is 11 -->

    <integer name="def_music_speaker_volume" translatable="false">11</integer>



    <!-- System speaker Volume,its value is from 0 to 7,default value is 7 -->

    <integer name="def_system_speaker_volume" translatable="false">7</integer>



    <!-- Voice Call speaker Volume,its value is from 0 to 5,default value is 4 -->

    <integer name="def_voice_call_speaker_volume" translatable="false">4</integer>



    <!-- Alarm speaker Volume,its value is from 0 to 7,default value is 6 -->

    <integer name="def_alarm_speaker_volume" translatable="false">6</integer>



    <!-- Notification speaker Volume,its value is from 0 to 7,default value is 5 -->

    <integer name="def_notification_speaker_volume" translatable="false">5</integer>



    <!-- Bluetooth sco speaker Volume,its value is from 0 to 15,default value is 7 -->

    <integer name="def_bluetooth_sco_speaker_volume" translatable="false">7</integer>



    <!-- Voice Call earpiece Volume,its value is from 0 to 5,default value is 4 -->

    <integer name="def_voice_call_earpiece_volume" translatable="false">4</integer>

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

+14 −0
Original line number Diff line number Diff line
@@ -2243,12 +2243,26 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                    mContext.getResources().getInteger(R.integer.def_bluetooth_sco_headset_volume));



            // set speaker default volume

            loadSetting(stmt, Settings.System.VOLUME_MUSIC + SPEAKER,

                    mContext.getResources().getInteger(R.integer.def_music_speaker_volume));

            loadSetting(stmt, Settings.System.VOLUME_RING + SPEAKER,

                    mContext.getResources().getInteger(R.integer.def_ringtone_speaker_volume));

            loadSetting(stmt, Settings.System.VOLUME_SYSTEM+ SPEAKER,

                    mContext.getResources().getInteger(R.integer.def_system_speaker_volume));

            loadSetting(

                    stmt,

                    Settings.System.VOLUME_VOICE + SPEAKER,

                    mContext.getResources().getInteger(R.integer.def_voice_call_speaker_volume));

            loadSetting(stmt, Settings.System.VOLUME_ALARM + SPEAKER,

                    mContext.getResources().getInteger(R.integer.def_alarm_speaker_volume));

            loadSetting(

                    stmt,

                    Settings.System.VOLUME_NOTIFICATION + SPEAKER,

                    mContext.getResources().getInteger(R.integer.def_notification_speaker_volume));

            loadSetting(

                    stmt,

                    Settings.System.VOLUME_BLUETOOTH_SCO + SPEAKER,

                    mContext.getResources().getInteger(R.integer.def_bluetooth_sco_speaker_volume));



            // set earpiece default volume

            loadSetting(