Commit cc22b959 authored by Henry Jian's avatar Henry Jian Committed by Commit Bot

[Android WebAPK] Allow WAM to set has_maskable_icon

Previously, when Chrome checks if a WebAPK needs update,
the has_maskable_icon value in its Android manifest is
mistakenly fixed to true. This CL allows WAM server to
set the has_maskable_icon value based on actaully manifest
data.

Bug: 977173
Change-Id: I7ebebb323c5544ed7a8ac71c4231c7745917a001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885311
Commit-Queue: Henry Jian <hzjian@google.com>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarPeter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710819}
parent 5cd23209
......@@ -134,7 +134,9 @@
<meta-data android:name="org.chromium.webapk.shell_apk.defaultBackgroundColorId" android:resource="@color/webapp_default_bg" />
<meta-data android:name="org.chromium.webapk.shell_apk.iconId" android:resource="@mipmap/app_icon" />
{{#has_maskable_icon}}
<meta-data android:name="org.chromium.webapk.shell_apk.maskableIconId" android:resource="@mipmap/maskable_app_icon"/>
{{/has_maskable_icon}}
<meta-data android:name="org.chromium.webapk.shell_apk.splashId" android:resource="@drawable/splash_icon" />
<meta-data android:name="org.chromium.webapk.shell_apk.isSplashIconMaskableBooleanId" android:resource="@bool/is_splash_icon_maskable"/>
<meta-data android:name="org.chromium.webapk.shell_apk.distributor" android:value="{{{distributor}}}" />
......
......@@ -12,4 +12,4 @@
# //chrome/android/webapk/shell_apk:webapk is changed. This includes
# Java files, Android resource files and AndroidManifest.xml. Does not affect
# Chrome.apk
current_shell_apk_version = 114
current_shell_apk_version = 115
......@@ -36,5 +36,6 @@
"mime_types": [{
"mime_type": "image/*"
}]
}]
}],
"has_maskable_icon": true
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment