Commit 46aa59fe authored by Henry Jian's avatar Henry Jian Committed by Commit Bot

Revert "[Android WebAPK] Link to a shortcuts file from the manifest."

This (mostly) reverts commit f0ecb909,
except that it increments the current_version.gni instead of reverting
it.

Reason for revert: I need to modify the shell apk and push it now
but this CL needs to wait for WAM server change to be pushable.

Original change's description:
> [Android WebAPK] Link to a shortcuts file from the manifest.
>
> Instructions for enabling Android shortcuts:
> https://developer.android.com/guide/topics/ui/shortcuts/creating-shortcuts
>
> This is the first step for enabling shortcuts. The server will populate
> shortcuts.xml depending on the Manifest shortcuts provided (and also
> generate additional string resource files).

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

Bug: 1010471
Change-Id: I0b302074e4b218f96e7ec8b7b1686ea1b6825b28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1885213
Commit-Queue: Henry Jian <hzjian@google.com>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarPeter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710472}
parent 5ce5ed80
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
</activity> </activity>
<activity android:name="org.chromium.webapk.shell_apk.h2o.SplashActivity" <activity android:name="org.chromium.webapk.shell_apk.h2o.SplashActivity"
android:theme="@style/SplashTheme" android:theme="@style/SplashTheme"
...@@ -77,7 +76,6 @@ ...@@ -77,7 +76,6 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
</activity> </activity>
{{#share_template}} {{#share_template}}
......
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
# //chrome/android/webapk/shell_apk:webapk is changed. This includes # //chrome/android/webapk/shell_apk:webapk is changed. This includes
# Java files, Android resource files and AndroidManifest.xml. Does not affect # Java files, Android resource files and AndroidManifest.xml. Does not affect
# Chrome.apk # Chrome.apk
current_shell_apk_version = 113 current_shell_apk_version = 114
<shortcuts xmlns:android='http://schemas.android.com/apk/res/android'>
{{{shortcuts}}}
</shortcuts>
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