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

Commit 68153821 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread

parents 4170b463 18b41374

packages/SettingsProvider/res/values/defaults.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,9 @@ 
    <string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string>

    <string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string>

    <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>

    <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>





    <!-- Notifications use ringer volume -->

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



    <!-- Default for Settings.System.VIBRATE_IN_SILENT -->

    <!-- Default for Settings.System.VIBRATE_IN_SILENT -->

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

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

</resources>
 
</resources>

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -1068,6 +1068,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
    

    

            loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,

            loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,

                    R.bool.def_vibrate_in_silent);

                    R.bool.def_vibrate_in_silent);



            // Set notification volume to follow ringer volume by default

            loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME,

                    R.bool.def_notifications_use_ring_volume);



        } finally {

        } finally {

            if (stmt != null) stmt.close();

            if (stmt != null) stmt.close();

        }

        }