DanReyLop has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247043
Change subject: Move the app launcher icons to de mipmap-{density} folder
structure
......................................................................
Move the app launcher icons to de 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 displayes at a different density than the
device density, it's best practice to put them into the mipmap directories.
Bug: T97239
Change-Id: Id06bb82c42da1d40d87eb37b065365a458616803
---
D app/src/alpha/res/drawable-ldpi/launcher.png
D app/src/alpha/res/drawable-xxhdpi/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-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
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
M scripts/convert-icons.py
24 files changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/43/247043/1
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-xxhdpi/launcher.png
b/app/src/alpha/res/drawable-xxhdpi/launcher.png
deleted file mode 100644
index 08cdf12..0000000
--- a/app/src/alpha/res/drawable-xxhdpi/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-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-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
diff --git a/scripts/convert-icons.py b/scripts/convert-icons.py
index abe1f19..eb8a6bd 100755
--- a/scripts/convert-icons.py
+++ b/scripts/convert-icons.py
@@ -72,12 +72,10 @@
def convert(self):
for svg in self.svgs:
if ".nonspecific." in svg:
- self._do_export("xxhdpi", svg, "drawable")
+ self._do_export("xxxhdpi", svg, "drawable")
else:
for density in DENSITIES.keys():
- # For xxxhdpi only generate launcher icons
- if not (density == 'xxxhdpi' and 'launcher' not in svg):
- self._do_flop(density, self._do_export(density, svg,
"drawable-" + density))
+ self._do_flop(density, self._do_export(density, svg,
"drawable-" + density))
print(u"\u2713 %s" % os.path.basename(svg))
--
To view, visit https://gerrit.wikimedia.org/r/247043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id06bb82c42da1d40d87eb37b065365a458616803
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: DanReyLop <daniel.rey.lo...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
