diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-02-10 02:36:16 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-12 13:30:42 -0800 |
| commit | 0af50673b9b0107fb390533f8ee54467017d3487 (patch) | |
| tree | c2a00a39b410f3b5d76ad1d231600b614b7e705b /res/xml | |
| parent | 724fd2f5169d4462b29def9d44a24020156cf87a (diff) | |
| download | packages_apps_Settings-0af50673b9b0107fb390533f8ee54467017d3487.tar.gz packages_apps_Settings-0af50673b9b0107fb390533f8ee54467017d3487.tar.bz2 packages_apps_Settings-0af50673b9b0107fb390533f8ee54467017d3487.zip | |
Remove duplicate charging sounds option
* CM setting allows charging sounds on any power source, while AOSP
allows charging sounds only on wireless charging
* The AOSP toggle has been broken since
fw/base 42f4f2f2ff4278ca8411504617f55a712562c242
* Use the AOSP setting while keeping the improved CM code
Change-Id: Ia747d8949cf7ce94ad2a638f27aaa3c57f9aed19
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/other_sound_settings.xml | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml index 3ba3dfb5c..ccedbb3f7 100644 --- a/res/xml/other_sound_settings.xml +++ b/res/xml/other_sound_settings.xml @@ -31,12 +31,6 @@ android:title="@string/screen_locking_sounds_title" android:persistent="false" /> - <!-- Charging sounds --> - <SwitchPreference - android:key="charging_sounds" - android:title="@string/charging_sounds_title" - android:persistent="false" /> - <!-- Docking sounds --> <SwitchPreference android:key="docking_sounds" @@ -67,28 +61,29 @@ android:title="@string/emergency_tone_title" android:persistent="false" /> + <!-- Charging sounds --> <PreferenceCategory android:title="@string/power_notifications_category_title"> - <SwitchPreference - android:key="power_notifications" - android:title="@string/power_notifications_enable_title" - android:summary="@string/power_notifications_enable_summary" - android:defaultValue="false" - android:persistent="false" /> - - <SwitchPreference - android:key="power_notifications_vibrate" - android:title="@string/power_notifications_vibrate_title" - android:defaultValue="false" - android:dependency="power_notifications" - android:persistent="false" /> - - <Preference - android:key="power_notifications_ringtone" - android:title="@string/power_notifications_ringtone_title" - android:dependency="power_notifications" - android:persistent="false" /> + <SwitchPreference + android:key="charging_sounds" + android:title="@string/power_notifications_enable_title" + android:summary="@string/power_notifications_enable_summary" + android:defaultValue="false" + android:persistent="false" /> + + <SwitchPreference + android:key="power_notifications_vibrate" + android:title="@string/power_notifications_vibrate_title" + android:defaultValue="false" + android:dependency="charging_sounds" + android:persistent="false" /> + + <Preference + android:key="power_notifications_ringtone" + android:title="@string/power_notifications_ringtone_title" + android:dependency="charging_sounds" + android:persistent="false" /> </PreferenceCategory> </PreferenceScreen> |