From ef585eba42ce297c0142f7d619ed7465f26b289c Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Fri, 18 Oct 2019 09:15:20 -0400
Subject: [PATCH] Revert "Fix invite drawable on API 21."

This reverts commit 78fbfe40736dd8c9ccafb402aa7fc6921c1d4496.

We have turned on AppCompatDelegate.setCompatVectorFromResourcesEnabled(true) now for API19.
---
 res/drawable/circle_invite.xml                |  5 ---
 res/drawable/ic_invite_circle.xml             | 14 ++++++
 .../contact_selection_invite_action_item.xml  | 44 +++++--------------
 3 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 res/drawable/circle_invite.xml
 create mode 100644 res/drawable/ic_invite_circle.xml

diff --git a/res/drawable/circle_invite.xml b/res/drawable/circle_invite.xml
deleted file mode 100644
index 174d49351f..0000000000
--- a/res/drawable/circle_invite.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval">
-    <solid android:color="#70707C" />
-</shape>
diff --git a/res/drawable/ic_invite_circle.xml b/res/drawable/ic_invite_circle.xml
new file mode 100644
index 0000000000..bf11042bc2
--- /dev/null
+++ b/res/drawable/ic_invite_circle.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#70707C" />
+        </shape>
+    </item>
+    <item
+        android:bottom="10dp"
+        android:drawable="@drawable/ic_invite_28dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="10dp" />
+</layer-list>
diff --git a/res/layout/contact_selection_invite_action_item.xml b/res/layout/contact_selection_invite_action_item.xml
index 3a80975403..e8cfd20df2 100644
--- a/res/layout/contact_selection_invite_action_item.xml
+++ b/res/layout/contact_selection_invite_action_item.xml
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Signal.Text.Body"
     android:layout_width="match_parent"
     android:layout_height="@dimen/contact_selection_item_height"
+    android:drawableStart="@drawable/ic_invite_circle"
+    android:drawablePadding="16dp"
+    android:ellipsize="marquee"
+    android:fontFamily="sans-serif-medium"
+    android:gravity="center_vertical|start"
+    android:labelFor="@id/action_icon"
     android:paddingStart="@dimen/selection_item_header_width"
-    tools:ignore="RtlSymmetry,UseCompoundDrawables">
-
-    <FrameLayout
-        android:layout_width="@dimen/selection_item_header_width"
-        android:layout_height="@dimen/selection_item_header_width"
-        android:layout_gravity="center_vertical"
-        android:background="@drawable/circle_invite">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp"
-            app:srcCompat="@drawable/ic_invite_28dp"
-            tools:ignore="ContentDescription" />
-    </FrameLayout>
-
-    <TextView
-        style="@style/Signal.Text.Body"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/contact_selection_item_height"
-        android:layout_marginStart="16dp"
-        android:ellipsize="marquee"
-        android:fontFamily="sans-serif-medium"
-        android:gravity="center_vertical|start"
-        android:labelFor="@id/action_icon"
-        android:singleLine="true"
-        android:text="@string/contact_selection_activity__invite_to_signal"
-        android:textAlignment="viewStart" />
-
-</LinearLayout>
+    android:singleLine="true"
+    android:text="@string/contact_selection_activity__invite_to_signal"
+    android:textAlignment="viewStart"
+    tools:ignore="RtlSymmetry" />