Merge branch 'dev' into smb060

This commit is contained in:
Milos Kozak 2017-12-26 01:22:49 +01:00
commit 0ab259f61f

View file

@ -4,6 +4,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="info.nightscout.androidaps.plugins.Overview.Dialogs.EditQuickWizardDialog"> tools:context="info.nightscout.androidaps.plugins.Overview.Dialogs.EditQuickWizardDialog">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -151,4 +155,6 @@
</LinearLayout> </LinearLayout>
</ScrollView>
</FrameLayout> </FrameLayout>