mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 20:08:53 +01:00
Merged master into release-2.6
This commit is contained in:
@@ -155,6 +155,10 @@
|
||||
|
||||
<string name="pref_sent_timestamps">Sent timestamps</string>
|
||||
<string name="pref_sent_timestamps_summary">Show the timestamp for when a message was sent, not received</string>
|
||||
<string name="pref_force_timestamps">Force timestamps</string>
|
||||
<string name="pref_force_timestamps_summary">Enable timestamps for all messages</string>
|
||||
<string name="pref_key_timestamp_delay">New timestamp delay</string>
|
||||
<string name="pref_key_timestamp_delay_summary">The number of minutes which must elapse between two messages in order for a new timestamp to be shown.</string>
|
||||
<string name="pref_compose_favorites">Starred contacts</string>
|
||||
<string name="pref_compose_summary_favorites">Show your starred contacts in the QK Compose window, making them only a tap away</string>
|
||||
<string name="pref_prox_sensor_call">Proximity sensor</string>
|
||||
|
||||
@@ -137,6 +137,22 @@
|
||||
android:summary="@string/pref_sent_timestamps_summary"
|
||||
android:title="@string/pref_sent_timestamps"
|
||||
android:widgetLayout="@layout/view_switch" />
|
||||
<EditTextPreference
|
||||
android:defaultValue="60"
|
||||
android:dependency="pref_key_force_timestamps"
|
||||
android:inputType="number"
|
||||
android:key="pref_key_timestamp_delay"
|
||||
android:layout="@layout/list_item_preference"
|
||||
android:summary="@string/pref_key_timestamp_delay_summary"
|
||||
android:title="@string/pref_key_timestamp_delay" />
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pref_key_force_timestamps"
|
||||
android:layout="@layout/list_item_preference"
|
||||
android:summary="@string/pref_force_timestamps_summary"
|
||||
android:title="@string/pref_force_timestamps"
|
||||
android:widgetLayout="@layout/view_switch"
|
||||
android:disableDependentsState="true"/>
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="pref_key_compose_favorites"
|
||||
|
||||
Reference in New Issue
Block a user