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

Commit ae91c0a9 authored by John Spurlock's avatar John Spurlock
Browse files

Settings: Add setting to mute wireless charging sound. 

Bug: 19538553
Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
parent 0d2a8d20

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -5969,6 +5969,9 @@ 
    <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->

    <string name="screen_locking_sounds_title">Screen locking sounds</string>



    <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->

    <string name="charging_sounds_title">Charging sounds</string>



    <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->

    <string name="docking_sounds_title">Docking sounds</string>

res/xml/other_sound_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ 
            android:switchTextOn=""

            android:persistent="false" />



    <!-- Charging sounds -->

    <SwitchPreference

            android:key="charging_sounds"

            android:title="@string/charging_sounds_title"

            android:switchTextOff=""

            android:switchTextOn=""

            android:persistent="false" />



    <!-- Docking sounds -->

    <SwitchPreference

            android:key="docking_sounds"

src/com/android/settings/notification/OtherSoundSettings.java

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In 


    private static final String KEY_DIAL_PAD_TONES = "dial_pad_tones";

    private static final String KEY_SCREEN_LOCKING_SOUNDS = "screen_locking_sounds";

    private static final String KEY_CHARGING_SOUNDS = "charging_sounds";

    private static final String KEY_DOCKING_SOUNDS = "docking_sounds";

    private static final String KEY_TOUCH_SOUNDS = "touch_sounds";

    private static final String KEY_VIBRATE_ON_TOUCH = "vibrate_on_touch";
@@ -77,6 +78,9 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In 
    private static final SettingPref PREF_SCREEN_LOCKING_SOUNDS = new SettingPref(

            TYPE_SYSTEM, KEY_SCREEN_LOCKING_SOUNDS, System.LOCKSCREEN_SOUNDS_ENABLED, DEFAULT_ON);



    private static final SettingPref PREF_CHARGING_SOUNDS = new SettingPref(

            TYPE_GLOBAL, KEY_CHARGING_SOUNDS, Global.CHARGING_SOUNDS_ENABLED, DEFAULT_ON);



    private static final SettingPref PREF_DOCKING_SOUNDS = new SettingPref(

            TYPE_GLOBAL, KEY_DOCKING_SOUNDS, Global.DOCK_SOUNDS_ENABLED, DEFAULT_ON) {

        @Override
@@ -155,6 +159,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In 
    private static final SettingPref[] PREFS = {

        PREF_DIAL_PAD_TONES,

        PREF_SCREEN_LOCKING_SOUNDS,

        PREF_CHARGING_SOUNDS,

        PREF_DOCKING_SOUNDS,

        PREF_TOUCH_SOUNDS,

        PREF_VIBRATE_ON_TOUCH,