Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge

This commit is contained in:
Bart Sopers 2020-12-23 12:12:38 +01:00
commit 242b6292ef

View file

@ -30,7 +30,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -56,7 +58,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -83,7 +87,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -110,7 +116,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -136,7 +144,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -177,7 +187,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -204,7 +216,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -231,7 +245,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -258,7 +274,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -284,7 +302,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -311,7 +331,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="16pt"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">