jenkins-bot has submitted this change and it was merged.
Change subject: Move the app launcher icons to the mipmap-{density} folder
structure
......................................................................
Move the app launcher icons to the mipmap-{density} folder structure
The new convention to store the launcher icon of an android app is to use
the res/mipmap-{...} folders (for example, res/mipmap-xhdpi/launcher.png,
res/mipmap-xxhdpi/launcher.png, and so on). The images in those directories
won't be erased by the most common APK optimization tools (those tools usually
generate a different APK for each display density, and so they remove all the
images under res/drawable-{...} with a density different than the specified).
Since launcher icons can be displayed at a different density than the
device density, it's best practice to put them into the mipmap directories.
Bug: T97239
Change-Id: Iac1bff9e808a41a6b82eb6d97968365c2842a3f0
---
D app/src/alpha/res/drawable-ldpi/launcher.png
R app/src/alpha/res/mipmap-hdpi/launcher.png
R app/src/alpha/res/mipmap-mdpi/launcher.png
R app/src/alpha/res/mipmap-xhdpi/launcher.png
R app/src/alpha/res/mipmap-xxhdpi/launcher.png
R app/src/alpha/res/mipmap-xxxhdpi/launcher.png
D app/src/beta/res/drawable-ldpi/launcher.png
R app/src/beta/res/mipmap-hdpi/launcher.png
R app/src/beta/res/mipmap-mdpi/launcher.png
R app/src/beta/res/mipmap-xhdpi/launcher.png
R app/src/beta/res/mipmap-xxhdpi/launcher.png
R app/src/beta/res/mipmap-xxxhdpi/launcher.png
D app/src/dev/res/drawable-ldpi/launcher.png
R app/src/dev/res/mipmap-hdpi/launcher.png
R app/src/dev/res/mipmap-mdpi/launcher.png
R app/src/dev/res/mipmap-xhdpi/launcher.png
R app/src/dev/res/mipmap-xxhdpi/launcher.png
R app/src/dev/res/mipmap-xxxhdpi/launcher.png
M app/src/main/AndroidManifest.xml
R app/src/main/res/mipmap-hdpi/launcher.png
R app/src/main/res/mipmap-mdpi/launcher.png
R app/src/main/res/mipmap-xhdpi/launcher.png
R app/src/main/res/mipmap-xxhdpi/launcher.png
R app/src/main/res/mipmap-xxxhdpi/launcher.png
24 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Sniedzielski: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/app/src/alpha/res/drawable-ldpi/launcher.png
b/app/src/alpha/res/drawable-ldpi/launcher.png
deleted file mode 100644
index 41cb802..0000000
--- a/app/src/alpha/res/drawable-ldpi/launcher.png
+++ /dev/null
Binary files differ
diff --git a/app/src/alpha/res/drawable-hdpi/launcher.png
b/app/src/alpha/res/mipmap-hdpi/launcher.png
similarity index 100%
rename from app/src/alpha/res/drawable-hdpi/launcher.png
rename to app/src/alpha/res/mipmap-hdpi/launcher.png
Binary files differ
diff --git a/app/src/alpha/res/drawable-mdpi/launcher.png
b/app/src/alpha/res/mipmap-mdpi/launcher.png
similarity index 100%
rename from app/src/alpha/res/drawable-mdpi/launcher.png
rename to app/src/alpha/res/mipmap-mdpi/launcher.png
Binary files differ
diff --git a/app/src/alpha/res/drawable-xhdpi/launcher.png
b/app/src/alpha/res/mipmap-xhdpi/launcher.png
similarity index 100%
rename from app/src/alpha/res/drawable-xhdpi/launcher.png
rename to app/src/alpha/res/mipmap-xhdpi/launcher.png
Binary files differ
diff --git a/app/src/alpha/res/drawable-xxhdpi/launcher.png
b/app/src/alpha/res/mipmap-xxhdpi/launcher.png
similarity index 100%
rename from app/src/alpha/res/drawable-xxhdpi/launcher.png
rename to app/src/alpha/res/mipmap-xxhdpi/launcher.png
Binary files differ
diff --git a/app/src/alpha/res/drawable-xxxhdpi/launcher.png
b/app/src/alpha/res/mipmap-xxxhdpi/launcher.png
similarity index 100%
rename from app/src/alpha/res/drawable-xxxhdpi/launcher.png
rename to app/src/alpha/res/mipmap-xxxhdpi/launcher.png
Binary files differ
diff --git a/app/src/beta/res/drawable-ldpi/launcher.png
b/app/src/beta/res/drawable-ldpi/launcher.png
deleted file mode 100644
index 3b434d1..0000000
--- a/app/src/beta/res/drawable-ldpi/launcher.png
+++ /dev/null
Binary files differ
diff --git a/app/src/beta/res/drawable-hdpi/launcher.png
b/app/src/beta/res/mipmap-hdpi/launcher.png
similarity index 100%
rename from app/src/beta/res/drawable-hdpi/launcher.png
rename to app/src/beta/res/mipmap-hdpi/launcher.png
Binary files differ
diff --git a/app/src/beta/res/drawable-mdpi/launcher.png
b/app/src/beta/res/mipmap-mdpi/launcher.png
similarity index 100%
rename from app/src/beta/res/drawable-mdpi/launcher.png
rename to app/src/beta/res/mipmap-mdpi/launcher.png
Binary files differ
diff --git a/app/src/beta/res/drawable-xhdpi/launcher.png
b/app/src/beta/res/mipmap-xhdpi/launcher.png
similarity index 100%
rename from app/src/beta/res/drawable-xhdpi/launcher.png
rename to app/src/beta/res/mipmap-xhdpi/launcher.png
Binary files differ
diff --git a/app/src/beta/res/drawable-xxhdpi/launcher.png
b/app/src/beta/res/mipmap-xxhdpi/launcher.png
similarity index 100%
rename from app/src/beta/res/drawable-xxhdpi/launcher.png
rename to app/src/beta/res/mipmap-xxhdpi/launcher.png
Binary files differ
diff --git a/app/src/beta/res/drawable-xxxhdpi/launcher.png
b/app/src/beta/res/mipmap-xxxhdpi/launcher.png
similarity index 100%
rename from app/src/beta/res/drawable-xxxhdpi/launcher.png
rename to app/src/beta/res/mipmap-xxxhdpi/launcher.png
Binary files differ
diff --git a/app/src/dev/res/drawable-ldpi/launcher.png
b/app/src/dev/res/drawable-ldpi/launcher.png
deleted file mode 100644
index 0d3748a..0000000
--- a/app/src/dev/res/drawable-ldpi/launcher.png
+++ /dev/null
Binary files differ
diff --git a/app/src/dev/res/drawable-hdpi/launcher.png
b/app/src/dev/res/mipmap-hdpi/launcher.png
similarity index 100%
rename from app/src/dev/res/drawable-hdpi/launcher.png
rename to app/src/dev/res/mipmap-hdpi/launcher.png
Binary files differ
diff --git a/app/src/dev/res/drawable-mdpi/launcher.png
b/app/src/dev/res/mipmap-mdpi/launcher.png
similarity index 100%
rename from app/src/dev/res/drawable-mdpi/launcher.png
rename to app/src/dev/res/mipmap-mdpi/launcher.png
Binary files differ
diff --git a/app/src/dev/res/drawable-xhdpi/launcher.png
b/app/src/dev/res/mipmap-xhdpi/launcher.png
similarity index 100%
rename from app/src/dev/res/drawable-xhdpi/launcher.png
rename to app/src/dev/res/mipmap-xhdpi/launcher.png
Binary files differ
diff --git a/app/src/dev/res/drawable-xxhdpi/launcher.png
b/app/src/dev/res/mipmap-xxhdpi/launcher.png
similarity index 100%
rename from app/src/dev/res/drawable-xxhdpi/launcher.png
rename to app/src/dev/res/mipmap-xxhdpi/launcher.png
Binary files differ
diff --git a/app/src/dev/res/drawable-xxxhdpi/launcher.png
b/app/src/dev/res/mipmap-xxxhdpi/launcher.png
similarity index 100%
rename from app/src/dev/res/drawable-xxxhdpi/launcher.png
rename to app/src/dev/res/mipmap-xxxhdpi/launcher.png
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 66980ea..6b376fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
<application
android:allowBackup="true"
android:supportsRtl="true"
- android:icon="@drawable/launcher"
+ android:icon="@mipmap/launcher"
android:label="@string/app_name"
android:name=".WikipediaApp"
android:theme="@style/AppTheme">
@@ -154,7 +154,7 @@
/>
<receiver
- android:icon="@drawable/launcher"
+ android:icon="@mipmap/launcher"
android:label="@string/widget_name_search"
android:name="org.wikipedia.widgets.WidgetProviderSearch" >
<intent-filter >
@@ -167,7 +167,7 @@
</receiver>
<receiver
- android:icon="@drawable/launcher"
+ android:icon="@mipmap/launcher"
android:label="@string/widget_name_featured_page"
android:name="org.wikipedia.widgets.WidgetProviderFeaturedPage" >
<intent-filter >
diff --git a/app/src/main/res/drawable-hdpi/launcher.png
b/app/src/main/res/mipmap-hdpi/launcher.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/launcher.png
rename to app/src/main/res/mipmap-hdpi/launcher.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/launcher.png
b/app/src/main/res/mipmap-mdpi/launcher.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/launcher.png
rename to app/src/main/res/mipmap-mdpi/launcher.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/launcher.png
b/app/src/main/res/mipmap-xhdpi/launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/launcher.png
rename to app/src/main/res/mipmap-xhdpi/launcher.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/launcher.png
b/app/src/main/res/mipmap-xxhdpi/launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/launcher.png
rename to app/src/main/res/mipmap-xxhdpi/launcher.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/launcher.png
b/app/src/main/res/mipmap-xxxhdpi/launcher.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/launcher.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/247463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac1bff9e808a41a6b82eb6d97968365c2842a3f0
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: DanReyLop <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: DanReyLop <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
