From 1b3e3716616cf5f629d83facb87934d9380ab613 Mon Sep 17 00:00:00 2001
From: Alexander Martinz <amartinz@shiftphones.com>
Date: Mon, 2 Apr 2018 18:30:18 +0200
Subject: Trebuchet: get rid of old icons

Update all references to use the new adaptive icon and drop the old ones.

Change-Id: I8d81bc027ff965aad05d43514afbb77564b3651b
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
---
 AndroidManifest-common.xml                         |   2 +-
 go/AndroidManifest.xml                             |   2 +-
 res/drawable-v26/ic_launcher_home.xml              |  21 ---------------------
 res/drawable/ic_launcher_home.xml                  |  18 ------------------
 res/layout/target_edit_dialog.xml                  |   2 +-
 res/mipmap-hdpi/ic_launcher_home.png               | Bin 4070 -> 0 bytes
 res/mipmap-hdpi/ic_launcher_home_foreground.png    | Bin 4070 -> 0 bytes
 res/mipmap-mdpi/ic_launcher_home.png               | Bin 2503 -> 0 bytes
 res/mipmap-mdpi/ic_launcher_home_foreground.png    | Bin 2503 -> 0 bytes
 res/mipmap-xhdpi/ic_launcher_home.png              | Bin 5549 -> 0 bytes
 res/mipmap-xhdpi/ic_launcher_home_foreground.png   | Bin 5549 -> 0 bytes
 res/mipmap-xxhdpi/ic_launcher_home.png             | Bin 8626 -> 0 bytes
 res/mipmap-xxhdpi/ic_launcher_home_foreground.png  | Bin 8626 -> 0 bytes
 res/mipmap-xxxhdpi/ic_launcher_home.png            | Bin 11652 -> 0 bytes
 res/mipmap-xxxhdpi/ic_launcher_home_foreground.png | Bin 11652 -> 0 bytes
 15 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 res/drawable-v26/ic_launcher_home.xml
 delete mode 100644 res/drawable/ic_launcher_home.xml
 delete mode 100644 res/mipmap-hdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-hdpi/ic_launcher_home_foreground.png
 delete mode 100644 res/mipmap-mdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-mdpi/ic_launcher_home_foreground.png
 delete mode 100644 res/mipmap-xhdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-xhdpi/ic_launcher_home_foreground.png
 delete mode 100644 res/mipmap-xxhdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-xxhdpi/ic_launcher_home_foreground.png
 delete mode 100644 res/mipmap-xxxhdpi/ic_launcher_home.png
 delete mode 100644 res/mipmap-xxxhdpi/ic_launcher_home_foreground.png

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 822840220..425da565d 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -49,7 +49,7 @@
         android:fullBackupOnly="true"
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/derived_app_name"
         android:largeHeap="@bool/config_largeHeap"
         android:restoreAnyVersion="true"
diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
index 5f1400b5a..3ed3b794d 100644
--- a/go/AndroidManifest.xml
+++ b/go/AndroidManifest.xml
@@ -29,7 +29,7 @@
         android:fullBackupOnly="true"
         android:fullBackupContent="@xml/backupscheme"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher_home"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/derived_app_name"
         android:theme="@style/LauncherTheme"
         android:largeHeap="@bool/config_largeHeap"
diff --git a/res/drawable-v26/ic_launcher_home.xml b/res/drawable-v26/ic_launcher_home.xml
deleted file mode 100644
index 7038775f3..000000000
--- a/res/drawable-v26/ic_launcher_home.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/icon_background" />
-    <foreground>
-        <bitmap android:src="@mipmap/ic_launcher_home_foreground"/>
-    </foreground>
-</adaptive-icon>
diff --git a/res/drawable/ic_launcher_home.xml b/res/drawable/ic_launcher_home.xml
deleted file mode 100644
index a6f251995..000000000
--- a/res/drawable/ic_launcher_home.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@mipmap/ic_launcher_home" />
diff --git a/res/layout/target_edit_dialog.xml b/res/layout/target_edit_dialog.xml
index da66a9c2c..11bfefc80 100644
--- a/res/layout/target_edit_dialog.xml
+++ b/res/layout/target_edit_dialog.xml
@@ -30,7 +30,7 @@
         android:background="?android:selectableItemBackground"
         android:foreground="@drawable/ic_icon_change"
         android:scaleType="fitCenter"
-        tools:src="@mipmap/ic_launcher_home" />
+        tools:src="@mipmap/ic_launcher" />
 
     <EditText
         android:id="@+id/edit_dialog_title"
diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png
deleted file mode 100644
index 251f09d6d..000000000
Binary files a/res/mipmap-hdpi/ic_launcher_home.png and /dev/null differ
diff --git a/res/mipmap-hdpi/ic_launcher_home_foreground.png b/res/mipmap-hdpi/ic_launcher_home_foreground.png
deleted file mode 100644
index 251f09d6d..000000000
Binary files a/res/mipmap-hdpi/ic_launcher_home_foreground.png and /dev/null differ
diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png
deleted file mode 100644
index c72f83543..000000000
Binary files a/res/mipmap-mdpi/ic_launcher_home.png and /dev/null differ
diff --git a/res/mipmap-mdpi/ic_launcher_home_foreground.png b/res/mipmap-mdpi/ic_launcher_home_foreground.png
deleted file mode 100644
index c72f83543..000000000
Binary files a/res/mipmap-mdpi/ic_launcher_home_foreground.png and /dev/null differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
deleted file mode 100644
index ea8eaeb1a..000000000
Binary files a/res/mipmap-xhdpi/ic_launcher_home.png and /dev/null differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home_foreground.png b/res/mipmap-xhdpi/ic_launcher_home_foreground.png
deleted file mode 100644
index ea8eaeb1a..000000000
Binary files a/res/mipmap-xhdpi/ic_launcher_home_foreground.png and /dev/null differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png
deleted file mode 100644
index 0f3fb9a2c..000000000
Binary files a/res/mipmap-xxhdpi/ic_launcher_home.png and /dev/null differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png b/res/mipmap-xxhdpi/ic_launcher_home_foreground.png
deleted file mode 100644
index 0f3fb9a2c..000000000
Binary files a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png and /dev/null differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_home.png b/res/mipmap-xxxhdpi/ic_launcher_home.png
deleted file mode 100644
index a9f3a64da..000000000
Binary files a/res/mipmap-xxxhdpi/ic_launcher_home.png and /dev/null differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png b/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png
deleted file mode 100644
index a9f3a64da..000000000
Binary files a/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png and /dev/null differ
-- 
cgit v1.2.3