Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge

This commit is contained in:
Bart Sopers 2020-12-19 01:26:04 +01:00
commit fffc779ccc

View file

@ -26,7 +26,7 @@
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/rileylink_settings_container" android:id="@+id/rileylink_settings_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="512dp" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:layout_editor_absoluteY="55dp" /> tools:layout_editor_absoluteY="55dp" />