PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f0746678: Merge "Redesign vibration settings." into froyo

Browse Source 
Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp

* commit 'f07466782bb25ce4f2738133d0992f3531af28e5':
  Redesign vibration settings.
This commit is contained in:
Daniel Sandler
2010-04-21 18:15:40 -07:00
committed by Android Git Automerger
parent 9e2810bbed f07466782b
commit dd3791844f
4 changed files with 107 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/values/arrays.xml
View File

@@ -388,14 +388,16 @@
<!-- New incoming call vibrate options. -->
<string-array name="vibrate_entries">
<item>Always</item>
<item>Only when silent</item>
<item>Never</item>
<item>Only in Silent mode</item>
<item>Only when not in Silent mode</item>
</string-array>
<!-- Corresponds to AudioManager.VIBRATE_SETTING_*. Do not translate. -->
<!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
<string-array name="vibrate_values" translatable="false">
<item>1</item>
<item>2</item>
<item>0</item>
<item>always</item>
<item>never</item>
<item>silent</item>
<item>notsilent</item>
</string-array>
</resources>

4
res/values/strings.xml
View File

@@ -1022,9 +1022,9 @@
<!-- Sound settings screen, setting option summary text -->
<string name="vibrate_in_silent_summary">Allow vibration feedback in silent mode</string>
<!-- Sound settings screen, setting option name checkbox -->
<string name="vibrate_title">Phone vibrate</string>
<string name="vibrate_title">Vibrate</string>
<!-- Sound settings screen, setting option summary text -->
<string name="vibrate_summary">Vibrate phone for incoming calls</string>
<string name="vibrate_summary">Vibration feedback for calls and notifications</string>
<!-- Sound settings screen, setting option name -->
<string name="notification_sound_title">Notification ringtone</string>
<!-- Sound settings screen, setting option summary text -->

21
res/xml/sound_settings.xml
View File

@@ -31,12 +31,13 @@
android:order="1"
android:disableDependentsState="true" />
<CheckBoxPreference
android:key="vibrate_in_silent"
android:title="@string/vibrate_in_silent_title"
android:summary="@string/vibrate_in_silent_summary"
android:order="2"
android:persistent="false" />
<ListPreference
android:key="vibrate"
android:order="6"
android:title="@string/vibrate_title"
android:summary="@string/vibrate_summary"
android:entries="@array/vibrate_entries"
android:entryValues="@array/vibrate_values" />
<com.android.settings.RingerVolumePreference
android:key="ring_volume"
@@ -63,14 +64,6 @@
android:order="5"
android:ringtoneType="ringtone" />
<ListPreference
android:key="vibrate"
android:order="6"
android:title="@string/vibrate_title"
android:summary="@string/vibrate_summary"
android:entries="@array/vibrate_entries"
android:entryValues="@array/vibrate_values" />
</PreferenceCategory>
<PreferenceCategory