Show LED and ringtone setting values in their summaries

As instructed in the Android design guidelines. Also removed unnatural
capitalization.
This commit is contained in:
Veeti Paananen
2013-12-03 09:10:59 +02:00
parent 23e8035edd
commit 6eb094c87e
3 changed files with 67 additions and 12 deletions

View File

@@ -440,12 +440,8 @@
<string name="preferences__manage_configured_identity_keys">Manage configured identity keys</string>
<string name="preferences__notifications">Notifications</string>
<string name="preferences__display_message_notifications_in_status_bar">Display message notifications in status bar</string>
<string name="preferences__led_color">LED Color</string>
<string name="preferences__change_notification_led_color">Change notification LED color</string>
<string name="preferences__pref_led_blink_title">LED Blink Pattern</string>
<string name="preferences__change_notification_blink_pattern">Change notification LED blink pattern</string>
<string name="preferences__pref_led_blink_dialogtitle">Select LED Blink Pattern</string>
<string name="preferences__select_led_color">Select LED Color</string>
<string name="preferences__led_color">LED color</string>
<string name="preferences__pref_led_blink_title">LED blink pattern</string>
<string name="preferences__sound">Sound</string>
<string name="preferences__change_notification_sound">Change notification sound</string>
<string name="preferences__inthread_notifications">In-thread notifications</string>

View File

@@ -32,20 +32,16 @@
android:defaultValue="green"
android:title="@string/preferences__led_color"
android:dependency="pref_key_enable_notifications"
android:summary="@string/preferences__change_notification_led_color"
android:entries="@array/pref_led_color_entries"
android:entryValues="@array/pref_led_color_values"
android:dialogTitle="@string/preferences__select_led_color" />
android:entryValues="@array/pref_led_color_values" />
<org.thoughtcrime.securesms.preferences.LedBlinkPatternListPreference
android:key="pref_led_blink"
android:defaultValue="500,2000"
android:title="@string/preferences__pref_led_blink_title"
android:dependency="pref_key_enable_notifications"
android:summary="@string/preferences__change_notification_blink_pattern"
android:entries="@array/pref_led_blink_pattern_entries"
android:entryValues="@array/pref_led_blink_pattern_values"
android:dialogTitle="@string/preferences__pref_led_blink_dialogtitle" />
android:entryValues="@array/pref_led_blink_pattern_values" />
<RingtonePreference android:layout="?android:attr/preferenceLayoutChild"