From 0b1087edddd0a70083e00a48180b94985f268825 Mon Sep 17 00:00:00 2001
From: Bart Sopers <b.sopers@blueriq.com>
Date: Fri, 18 Dec 2020 23:47:12 +0100
Subject: [PATCH 1/2] fix typo

---
 omnipod/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index 1dde9ce781..a4a970c23d 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -115,7 +115,7 @@
     <string name="omnipod_error_set_basal_failed">Setting basal profile failed.</string>
     <string name="omnipod_error_cancel_temp_basal_failed_uncertain">Cancelling temp basal might have failed. Please manually refresh the Pod status from the Omnipod tab.</string>
     <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Setting temp basal failed. If a temp basal was previously running, it might have been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setting temp might have basal failed. If a temp basal was previously running, it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setting temp basal might have basal failed. If a temp basal was previously running, it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.</string>
     <string name="omnipod_error_set_temp_basal_failed_validation">TBR duration must be greater than zero and a multiple of %1$s minutes.</string>
     <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Setting time might have failed. Delivery might be suspended! Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.</string>
     <string name="omnipod_error_set_time_failed_delivery_suspended">Setting time failed. Delivery is suspended! Please manually resume delivery from the Omnipod tab.</string>

From a58394b31803ec9b7db2b84d52adb7793d74998b Mon Sep 17 00:00:00 2001
From: Bart Sopers <b.sopers@blueriq.com>
Date: Sat, 19 Dec 2020 01:25:33 +0100
Subject: [PATCH 2/2] Make RileyLink stats scrollview match parent's height

---
 rileylink/src/main/res/layout/rileylink_status.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rileylink/src/main/res/layout/rileylink_status.xml b/rileylink/src/main/res/layout/rileylink_status.xml
index 41425a96a6..c32fbd7ecb 100644
--- a/rileylink/src/main/res/layout/rileylink_status.xml
+++ b/rileylink/src/main/res/layout/rileylink_status.xml
@@ -26,7 +26,7 @@
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/rileylink_settings_container"
         android:layout_width="match_parent"
-        android:layout_height="512dp"
+        android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:layout_editor_absoluteY="55dp" />