From 00d5724cecf4e59c9c24e6ba24fe10c0a042791b Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 15 Jul 2022 12:49:12 -0300
Subject: [PATCH] Move androidTest into instrumentation build variant.

---
 app/build.gradle                                   | 14 ++++++++++++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml          |  5 +++++
 app/src/instrumentation/res/values/strings.xml     |  4 ++++
 3 files changed, 23 insertions(+)
 create mode 100644 app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 app/src/instrumentation/res/values/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 00f158d33..3b825b840 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,10 +76,12 @@ def selectableVariants = [
         'playProdDebug',
         'playProdSpinner',
         'playProdPerf',
+        'playProdInstrumentation',
         'playProdRelease',
         'playStagingDebug',
         'playStagingSpinner',
         'playStagingPerf',
+        'playStagingInstrumentation',
         'playStagingRelease',
         'websiteProdSpinner',
         'websiteProdRelease',
@@ -91,6 +93,7 @@ android {
 
     flavorDimensions 'distribution', 'environment'
     useLibrary 'org.apache.http.legacy'
+    testBuildType 'instrumentation'
 
     kotlinOptions {
         jvmTarget = "1.8"
@@ -262,6 +265,17 @@ android {
 
             buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
         }
+
+        instrumentation {
+            initWith debug
+            isDefault false
+            minifyEnabled false
+            matchingFallbacks = ['debug']
+            applicationIdSuffix ".instrumentation"
+
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Instrumentation\""
+        }
+
         spinner {
             initWith debug
             isDefault false
diff --git a/app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..12bf65e9d
--- /dev/null
+++ b/app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/signal_accent_green"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/instrumentation/res/values/strings.xml b/app/src/instrumentation/res/values/strings.xml
new file mode 100644
index 000000000..79bdc3491
--- /dev/null
+++ b/app/src/instrumentation/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Signal (Instrumentation)</string>
+</resources>