From b65d9ffaed3cd5adab24e84a54ec1e0959ea8f6e Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 24 Mar 2021 12:21:29 -0400
Subject: [PATCH] Fix KitKat crash when showing cell service warning during
 registration.

---
 ...or_outline_14_ultramarine.xml => ic_error_outline_14.xml} | 2 +-
 app/src/main/res/layout/fragment_registration_enter_code.xml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename app/src/main/res/drawable/{ic_error_outline_14_ultramarine.xml => ic_error_outline_14.xml} (88%)

diff --git a/app/src/main/res/drawable/ic_error_outline_14_ultramarine.xml b/app/src/main/res/drawable/ic_error_outline_14.xml
similarity index 88%
rename from app/src/main/res/drawable/ic_error_outline_14_ultramarine.xml
rename to app/src/main/res/drawable/ic_error_outline_14.xml
index 66049ea07b..895795a52f 100644
--- a/app/src/main/res/drawable/ic_error_outline_14_ultramarine.xml
+++ b/app/src/main/res/drawable/ic_error_outline_14.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/core_ultramarine"
+      android:fillColor="#FF000000"
       android:pathData="M10.75,6h2.5l-0.5,7.5h-1.5ZM12,2.5A9.5,9.5 0,1 0,21.5 12,9.511 9.511,0 0,0 12,2.5M12,1A11,11 0,1 1,1 12,11 11,0 0,1 12,1ZM13.5,16.5A1.5,1.5 0,1 0,12 18,1.5 1.5,0 0,0 13.5,16.5Z"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_registration_enter_code.xml b/app/src/main/res/layout/fragment_registration_enter_code.xml
index 19681693cf..b207407fa0 100644
--- a/app/src/main/res/layout/fragment_registration_enter_code.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_code.xml
@@ -111,13 +111,14 @@
                 tools:alpha="1"
                 tools:visibility="visible">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:layout_margin="2dp"
                     android:importantForAccessibility="no"
-                    app:srcCompat="@drawable/ic_error_outline_14_ultramarine" />
+                    app:tint="@color/core_ultramarine"
+                    app:srcCompat="@drawable/ic_error_outline_14" />
 
                 <TextView
                     style="@style/Signal.Text.Body.Registration"