Merge "Match add network button width to master switch and tint it." into qt-dev
diff --git a/res/layout/preference_widget_add.xml b/res/layout/preference_widget_add.xml
index 6e33a4d..9942bb2 100644
--- a/res/layout/preference_widget_add.xml
+++ b/res/layout/preference_widget_add.xml
@@ -21,10 +21,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
+ android:minWidth="@dimen/two_target_min_width"
android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/selectableItemBackground"
android:scaleType="center"
android:src="@drawable/ic_add_24dp"
+ android:tint="?android:attr/colorAccent"
android:contentDescription="@string/add" />
diff --git a/res/layout/preference_widget_master_switch.xml b/res/layout/preference_widget_master_switch.xml
index 7e28be9..26929ab 100644
--- a/res/layout/preference_widget_master_switch.xml
+++ b/res/layout/preference_widget_master_switch.xml
@@ -20,6 +20,7 @@
android:id="@+id/switchWidget"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:minWidth="@dimen/two_target_min_width"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f126525..b07865c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -393,4 +393,6 @@
<!-- Elevation of bluetooth icon -->
<dimen name="bt_icon_elevation">4dp</dimen>
+
+ <dimen name="two_target_min_width">80dp</dimen>
</resources>