From e3bf91b99bddbe61fbe9c968a75d9d78d033dea9 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 9 Jul 2018 14:56:31 -0700
Subject: [PATCH] Get rid of old references to @drawable/icon.

Fixes #7957
---
 AndroidManifest.xml        | 4 ++--
 res/drawable-v26/icon.xml  | 5 -----
 res/xml/contactsformat.xml | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 res/drawable-v26/icon.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dfd4576c40..9260b5391a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -193,9 +193,9 @@
         </intent-filter>
 
         <meta-data android:name="com.sec.minimode.icon.portrait.normal"
-            android:resource="@drawable/icon" />
+                   android:resource="@mipmap/ic_launcher" />
         <meta-data android:name="com.sec.minimode.icon.landscape.normal"
-            android:resource="@drawable/icon" />
+                   android:resource="@mipmap/ic_launcher" />
 
     </activity-alias>
 
diff --git a/res/drawable-v26/icon.xml b/res/drawable-v26/icon.xml
deleted file mode 100644
index ea2f2e3bc9..0000000000
--- a/res/drawable-v26/icon.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/signal_primary"/>
-    <foreground android:drawable="@drawable/icon_transparent"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/res/xml/contactsformat.xml b/res/xml/contactsformat.xml
index 7aaceef0be..f22102f76b 100644
--- a/res/xml/contactsformat.xml
+++ b/res/xml/contactsformat.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
     <ContactsDataKind
-            android:icon="@drawable/icon"
+            android:icon="@mipmap/ic_launcher"
             android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact"
             android:summaryColumn="data2"
             android:detailColumn="data3"
             android:detailSocialSummary="true"/>
     <ContactsDataKind
-            android:icon="@drawable/icon"
+            android:icon="@mipmap/ic_launcher"
             android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call"
             android:summaryColumn="data2"
             android:detailColumn="data3"/>