Merge branch 'dev' into smb060

This commit is contained in:
Milos Kozak 2017-12-23 11:07:48 +01:00
commit 51de0f16c1

View file

@ -354,7 +354,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <info.nightscout.utils.SingleClickButton
android:id="@+id/overview_accepttemplayout" android:id="@+id/overview_accepttemplayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -370,7 +370,7 @@
android:layout_weight="0.5" android:layout_weight="0.5"
android:text="Accept new temp\n0.25U/h" android:text="Accept new temp\n0.25U/h"
android:textColor="@color/colorAcceptTempButton" /> android:textColor="@color/colorAcceptTempButton" />
</LinearLayout> </info.nightscout.utils.SingleClickButton>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"