Merge master into blocksenders`

This commit is contained in:
Moez Bhatti
2015-10-18 22:38:56 -04:00
parent 4f31f33aef
commit 0dac7dbcc0
83 changed files with 891 additions and 760 deletions
+2
View File
@@ -49,6 +49,8 @@
<string name="details_body">Inhalt</string>
<string name="details_date_sent">Gesendet</string>
<string name="details_date_received">Empfangen</string>
<string name="rate_title">Gefällt dir QKSMS?</string>
<string name="rate_action">Bewerten</string>
<string name="pref_category_appearance">Erscheinungsbild</string>
<string name="pref_category_summary_appearance">Themen, Schriften, Farben, Avatare und mehr</string>
<string name="pref_category_general">Allgemein</string>
@@ -30,6 +30,7 @@
<item>Jacob Klinker</item>
<item>Jeff Gilfelt</item>
<item>Melnykov Oleksandr</item>
<item>ligi</item>
</string-array>
<string-array name="contributor_githubs">
@@ -39,6 +40,7 @@
<item>github.com/klinker41</item>
<item>github.com/jgilfelt</item>
<item>github.com/makovkastar</item>
<item>github.com/ligi</item>
</string-array>
<string-array name="contributor_projects">
@@ -48,6 +50,7 @@
<item>android-smsmms\nandroid-chips</item>
<item>SystemBarTint</item>
<item>FloatingActionButton</item>
<item>SnackEngage</item>
</string-array>
<string-array name="changelog_versions">
+6
View File
@@ -101,6 +101,10 @@
<string name="details_date_sent">Date sent</string>
<!--Title for date received of a message in message details popup-->
<string name="details_date_received">Date received</string>
<!--Title for rate snackbar-->
<string name="rate_title">Like QKSMS?</string>
<!--Title for rate button-->
<string name="rate_action">Rate</string>
<string name="pref_category_appearance">Appearance</string>
<string name="pref_category_summary_appearance">Themes, fonts, colors, avatars, and more</string>
@@ -209,6 +213,8 @@
<string name="pref_vibration_summary">Vibrate when new messages are received</string>
<string name="pref_notification_call">Call button</string>
<string name="pref_notification_call_summary">Call the sender of a message right from the notification</string>
<string name="pref_dimiss_read">Mark as read</string>
<string name="pref_dismiss_read_summary">Mark message as read when notification is cleared</string>
<string name="pref_delayed">Delayed messaging</string>
<string name="pref_delayed_summary">Wait before sending your messages, so you have a chance to review them</string>
+3
View File
@@ -117,6 +117,9 @@
<Preference
android:defaultValue="false"
android:key="pref_key_notification_call" />
<Preference
android:defaultValue="false"
android:key="pref_key_dismiss_read" />
<!-- QKSMS+ -->
<Preference
@@ -71,5 +71,13 @@
android:summary="@string/pref_notification_call_summary"
android:title="@string/pref_notification_call"
android:widgetLayout="@layout/view_checkbox" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="pref_key_notifications"
android:key="pref_key_dismiss_read"
android:layout="@layout/list_item_preference"
android:summary="@string/pref_dismiss_read_summary"
android:title="@string/pref_dimiss_read"
android:widgetLayout="@layout/view_checkbox" />
</PreferenceCategory>
</PreferenceScreen>
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:initialLayout="@layout/widget"
android:minHeight="220dp"
android:minWidth="220dp"
android:minHeight="110dp"
android:minWidth="180dp"
android:previewImage="@mipmap/ic_launcher_teal"
android:resizeMode="horizontal|vertical"
android:updatePeriodMillis="0"