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
+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"