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

Reland "[Android WebAPK] Create resources for web shortcuts."

This is a reland of commit 274ea563
Previously, the original commit was reverted to land another CL and push
the shell apk immediately. There was nothing wrong with the original CL.
Since the other CL was landed and pushed, we can now reland this CL.

Original change's description:
> [Android WebAPK] Create resources for web shortcuts.
>
> Resources used need to be pre-declared in the shell.
>
> Since we don't know how many shortcuts are needed for a web app until
> the creation request, we create 4 copies of the needed resources to
> declare a shortcut, since that is the maximum number of shortcuts
> allowed on Android.
>
> The following resources are needed (per shortcut):
> - name
> - short_name
> - icon (placeholder taken from
>     https://material.io/resources/icons/?icon=filter_1&style=baseline)

> The shortcuts.xml is also partially generated to use the resources, so
> that building the shell apk doesn't fail. They are all disabled by
> default, and will need to be re-enabled on the server-side.

> Bug: 1010471
> Change-Id: I5371b145afd943029de8eb679b0cf3044545cbe3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1875755
> Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
> Reviewed-by: Glenn Hartmann <hartmanng@chromium.org>
> Commit-Queue: Rayan Kanso <rayankans@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#709189}

Bug: 1010471
Change-Id: I72d7bb00e7bd80063e9eb5f87f61467ddc7a6889
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895864
Commit-Queue: Henry Jian <hzjian@google.com>
Reviewed-by: default avatarPeter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712192}
parent 1ab9b4ef
......@@ -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 = 117
current_shell_apk_version = 118
<shortcuts xmlns:android='http://schemas.android.com/apk/res/android'>
{{{shortcuts}}}
{{#shortcut_1}}
<shortcut
android:shortcutId='shortcut_1'
android:icon='@drawable/shortcut_1_icon'
android:shortcutShortLabel='@string/shortcut_1_short_name'
android:shortcutLongLabel='@string/shortcut_1_name'>
<intent
android:action='android.intent.action.MAIN'
android:targetPackage='{{{manifest_package}}}'
android:targetClass='{{{target_class}}}'
android:data='{{{launch_url}}}' />
</shortcut>
{{/shortcut_1}}
{{#shortcut_2}}
<shortcut
android:shortcutId='shortcut_2'
android:icon='@drawable/shortcut_2_icon'
android:shortcutShortLabel='@string/shortcut_2_short_name'
android:shortcutLongLabel='@string/shortcut_2_name'>
<intent
android:action='android.intent.action.MAIN'
android:targetPackage='{{{manifest_package}}}'
android:targetClass='{{{target_class}}}'
android:data='{{{launch_url}}}' />
</shortcut>
{{/shortcut_2}}
{{#shortcut_3}}
<shortcut
android:shortcutId='shortcut_3'
android:icon='@drawable/shortcut_3_icon'
android:shortcutShortLabel='@string/shortcut_3_short_name'
android:shortcutLongLabel='@string/shortcut_3_name'>
<intent
android:action='android.intent.action.MAIN'
android:targetPackage='{{{manifest_package}}}'
android:targetClass='{{{target_class}}}'
android:data='{{{launch_url}}}' />
</shortcut>
{{/shortcut_3}}
{{#shortcut_4}}
<shortcut
android:shortcutId='shortcut_4'
android:icon='@drawable/shortcut_4_icon'
android:shortcutShortLabel='@string/shortcut_4_short_name'
android:shortcutLongLabel='@string/shortcut_4_name'>
<intent
android:action='android.intent.action.MAIN'
android:targetPackage='{{{manifest_package}}}'
android:targetClass='{{{target_class}}}'
android:data='{{{launch_url}}}' />
</shortcut>
{{/shortcut_4}}
</shortcuts>
......@@ -139,6 +139,30 @@
<message name="IDS_NOTIFICATION_CHANNEL_NAME" desc="The user visible name of the default notification channel of the WebAPK.">
General
</message>
<message name="IDS_SHORTCUT_1_NAME" desc="The name of the first shortcut." translateable="false">
Shortcut 1
</message>
<message name="IDS_SHORTCUT_1_SHORT_NAME" desc="The short name of the first shortcut." translateable="false">
Shortcut 1
</message>
<message name="IDS_SHORTCUT_2_NAME" desc="The name of the second shortcut." translateable="false">
Shortcut 2
</message>
<message name="IDS_SHORTCUT_2_SHORT_NAME" desc="The short name of the second shortcut." translateable="false">
Shortcut 2
</message>
<message name="IDS_SHORTCUT_3_NAME" desc="The name of the third shortcut." translateable="false">
Shortcut 3
</message>
<message name="IDS_SHORTCUT_3_SHORT_NAME" desc="The short name of the third shortcut." translateable="false">
Shortcut 3
</message>
<message name="IDS_SHORTCUT_4_NAME" desc="The name of the fourth shortcut." translateable="false">
Shortcut 4
</message>
<message name="IDS_SHORTCUT_4_SHORT_NAME" desc="The short name of the fourth shortcut." translateable="false">
Shortcut 4
</message>
</messages>
</release>
</grit>
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