diff options
author | Andrew Lee <anwlee@google.com> | 2015-02-26 14:26:16 -0800 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-02-26 15:40:08 -0800 |
commit | e83576c5503596480d57ff9991df4ad99d26cfc4 (patch) | |
tree | b7ee42d4ea666a5ce37eaa441622c336d2b4dc37 /res/xml | |
parent | eb2097d840ac4e2f8709041cb7c9282697a309af (diff) | |
download | android_packages_apps_Dialer-e83576c5503596480d57ff9991df4ad99d26cfc4.tar.gz android_packages_apps_Dialer-e83576c5503596480d57ff9991df4ad99d26cfc4.tar.bz2 android_packages_apps_Dialer-e83576c5503596480d57ff9991df4ad99d26cfc4.zip |
Convert GeneralSettings to SoundSettings.
Rather than create a new fragment for "Sounds and vibration", reuse
the existing general settings fragment.
The other settings which used to reside general settings have been
moved into their own top-level settings fragments.
+ Rename layout file and fragment.
+ Tweak string names.
- Delete category heading; no longer necessary.
Bug: 19372734
Change-Id: I5690df7ecbd49da5d5af94889e6b68e053ce25ba
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/general_settings.xml | 47 | ||||
-rw-r--r-- | res/xml/sound_settings.xml | 40 |
2 files changed, 40 insertions, 47 deletions
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml deleted file mode 100644 index c856e1a46..000000000 --- a/res/xml/general_settings.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- - ~ Copyright (C) 2014 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> - -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - - <PreferenceCategory - android:key="dialer_general_sounds_category_key" - android:title="@string/sounds_and_vibrate_category_title" - android:persistent="false"> - - <com.android.dialer.settings.DefaultRingtonePreference - android:key="button_ringtone_key" - android:title="@string/ringtone_title" - android:dialogTitle="@string/ringtone_title" - android:persistent="false" - android:ringtoneType="ringtone" /> - - <CheckBoxPreference - android:key="button_play_dtmf_tone" - android:title="@string/dtmf_tone_enable_title" - android:persistent="false" - android:defaultValue="true" /> - - <CheckBoxPreference - android:key="button_vibrate_on_ring" - android:title="@string/vibrate_on_ring_title" - android:persistent="false" - android:defaultValue="false" /> - - </PreferenceCategory> - -</PreferenceScreen> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml new file mode 100644 index 000000000..e933eedc0 --- /dev/null +++ b/res/xml/sound_settings.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + + <com.android.dialer.settings.DefaultRingtonePreference + android:key="button_ringtone_key" + android:title="@string/ringtone_title" + android:dialogTitle="@string/ringtone_title" + android:persistent="false" + android:ringtoneType="ringtone" /> + + <CheckBoxPreference + android:key="button_play_dtmf_tone" + android:title="@string/dtmf_tone_enable_title" + android:persistent="false" + android:defaultValue="true" /> + + <CheckBoxPreference + android:key="button_vibrate_on_ring" + android:title="@string/vibrate_on_ring_title" + android:persistent="false" + android:defaultValue="false" /> + +</PreferenceScreen> |