summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Martinz <amartinz@shiftphones.com>2018-04-02 18:30:18 +0200
committerMichael Bestas <mkbestas@lineageos.org>2018-04-05 11:16:56 +0000
commit1b3e3716616cf5f629d83facb87934d9380ab613 (patch)
tree766e628e95d9b509ffd95efdd96b3fd23732d99b
parent965b2260f5ace96f61596164a37598bb780fc2e3 (diff)
downloadandroid_packages_apps_Trebuchet-1b3e3716616cf5f629d83facb87934d9380ab613.zip
android_packages_apps_Trebuchet-1b3e3716616cf5f629d83facb87934d9380ab613.tar.gz
android_packages_apps_Trebuchet-1b3e3716616cf5f629d83facb87934d9380ab613.tar.bz2
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>
-rw-r--r--AndroidManifest-common.xml2
-rw-r--r--go/AndroidManifest.xml2
-rw-r--r--res/drawable-v26/ic_launcher_home.xml21
-rw-r--r--res/drawable/ic_launcher_home.xml18
-rw-r--r--res/layout/target_edit_dialog.xml2
-rw-r--r--res/mipmap-hdpi/ic_launcher_home.pngbin4070 -> 0 bytes
-rw-r--r--res/mipmap-hdpi/ic_launcher_home_foreground.pngbin4070 -> 0 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_home.pngbin2503 -> 0 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_home_foreground.pngbin2503 -> 0 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_home.pngbin5549 -> 0 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_home_foreground.pngbin5549 -> 0 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_home.pngbin8626 -> 0 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_home_foreground.pngbin8626 -> 0 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_home.pngbin11652 -> 0 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_home_foreground.pngbin11652 -> 0 bytes
15 files changed, 3 insertions, 42 deletions
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 8228402..425da56 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 5f1400b..3ed3b79 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 7038775..0000000
--- 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 a6f2519..0000000
--- 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 da66a9c..11bfefc 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 251f09d..0000000
--- a/res/mipmap-hdpi/ic_launcher_home.png
+++ /dev/null
Binary files 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 251f09d..0000000
--- a/res/mipmap-hdpi/ic_launcher_home_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png
deleted file mode 100644
index c72f835..0000000
--- a/res/mipmap-mdpi/ic_launcher_home.png
+++ /dev/null
Binary files 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 c72f835..0000000
--- a/res/mipmap-mdpi/ic_launcher_home_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
deleted file mode 100644
index ea8eaeb..0000000
--- a/res/mipmap-xhdpi/ic_launcher_home.png
+++ /dev/null
Binary files 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 ea8eaeb..0000000
--- a/res/mipmap-xhdpi/ic_launcher_home_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png
deleted file mode 100644
index 0f3fb9a..0000000
--- a/res/mipmap-xxhdpi/ic_launcher_home.png
+++ /dev/null
Binary files 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 0f3fb9a..0000000
--- a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_home.png b/res/mipmap-xxxhdpi/ic_launcher_home.png
deleted file mode 100644
index a9f3a64..0000000
--- a/res/mipmap-xxxhdpi/ic_launcher_home.png
+++ /dev/null
Binary files 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 a9f3a64..0000000
--- a/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png
+++ /dev/null
Binary files differ