Commit 67701b41 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

[Android WebAPK]: Remove restriction on max WebAPK share targets

This CL removes the restriction on the maximum number of WebAPK share targets
by switching from a checked-in ShareActivity{{index}} to an activity alias.

Bug=None

Change-Id: I40567760615da5a9e0c218621df6eac749cf80d0
Reviewed-on: https://chromium-review.googlesource.com/1191088
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: default avatarXi Han <hanxi@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587808}
parent 7e131e19
...@@ -39,10 +39,9 @@ ...@@ -39,10 +39,9 @@
{{{raw_intent_filters}}} {{{raw_intent_filters}}}
</activity> </activity>
{{#share_template}} {{#share_template}}
<activity android:name="org.chromium.webapk.shell_apk.ShareActivity{{{index}}}" <activity-alias android:name="org.chromium.webapk.shell_apk.ShareActivity{{{index}}}"
android:label="{{{title}}}" android:label="{{{title}}}"
android:theme="@android:style/Theme.Translucent.NoTitleBar" android:targetActivity="org.chromium.webapk.shell_apk.ShareActivity">
android:excludeFromRecents="true">
<meta-data android:name="org.chromium.webapk.shell_apk.shareAction" android:value="{{{action}}}" /> <meta-data android:name="org.chromium.webapk.shell_apk.shareAction" android:value="{{{action}}}" />
<meta-data android:name="org.chromium.webapk.shell_apk.shareParamTitle" android:value="{{{param_title}}}" /> <meta-data android:name="org.chromium.webapk.shell_apk.shareParamTitle" android:value="{{{param_title}}}" />
<meta-data android:name="org.chromium.webapk.shell_apk.shareParamText" android:value="{{{param_text}}}" /> <meta-data android:name="org.chromium.webapk.shell_apk.shareParamText" android:value="{{{param_text}}}" />
...@@ -52,8 +51,11 @@ ...@@ -52,8 +51,11 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" /> <data android:mimeType="text/plain" />
</intent-filter> </intent-filter>
</activity> </activity-alias>
{{/share_template}} {{/share_template}}
<activity android:name="org.chromium.webapk.shell_apk.ShareActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:excludeFromRecents="true"/>
<meta-data android:name="org.chromium.webapk.shell_apk.shellApkVersion" android:value="{{{shell_apk_version}}}" /> <meta-data android:name="org.chromium.webapk.shell_apk.shellApkVersion" android:value="{{{shell_apk_version}}}" />
{{#bound_webapk}} {{#bound_webapk}}
<meta-data android:name="org.chromium.webapk.shell_apk.runtimeHost" android:value="{{{runtime_host}}}" /> <meta-data android:name="org.chromium.webapk.shell_apk.runtimeHost" android:value="{{{runtime_host}}}" />
......
...@@ -42,11 +42,6 @@ template("webapk_java") { ...@@ -42,11 +42,6 @@ template("webapk_java") {
"src/org/chromium/webapk/shell_apk/InstallHostBrowserDialog.java", "src/org/chromium/webapk/shell_apk/InstallHostBrowserDialog.java",
"src/org/chromium/webapk/shell_apk/MainActivity.java", "src/org/chromium/webapk/shell_apk/MainActivity.java",
"src/org/chromium/webapk/shell_apk/ShareActivity.java", "src/org/chromium/webapk/shell_apk/ShareActivity.java",
"src/org/chromium/webapk/shell_apk/ShareActivity0.java",
"src/org/chromium/webapk/shell_apk/ShareActivity1.java",
"src/org/chromium/webapk/shell_apk/ShareActivity2.java",
"src/org/chromium/webapk/shell_apk/ShareActivity3.java",
"src/org/chromium/webapk/shell_apk/ShareActivity4.java",
"src/org/chromium/webapk/shell_apk/WebApkServiceFactory.java", "src/org/chromium/webapk/shell_apk/WebApkServiceFactory.java",
"src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java", "src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java",
"src/org/chromium/webapk/shell_apk/WebApkUtils.java", "src/org/chromium/webapk/shell_apk/WebApkUtils.java",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# (including AndroidManifest.xml) is updated. This version should be incremented # (including AndroidManifest.xml) is updated. This version should be incremented
# prior to uploading a new ShellAPK to the WebAPK Minting Server. # prior to uploading a new ShellAPK to the WebAPK Minting Server.
# Does not affect Chrome.apk # Does not affect Chrome.apk
template_shell_apk_version = 50 template_shell_apk_version = 51
# The ShellAPK version expected by Chrome. Chrome will try to update the WebAPK # The ShellAPK version expected by Chrome. Chrome will try to update the WebAPK
# if the WebAPK's ShellAPK version is less than |expected_shell_apk_version|. # if the WebAPK's ShellAPK version is less than |expected_shell_apk_version|.
......
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.webapk.shell_apk;
/**
* Instance of a ShareActivity to support multiple share actions.
*/
public class ShareActivity0 extends ShareActivity {}
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.webapk.shell_apk;
/**
* Instance of a ShareActivity to support multiple share actions.
*/
public class ShareActivity1 extends ShareActivity {}
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.webapk.shell_apk;
/**
* Instance of a ShareActivity to support multiple share actions.
*/
public class ShareActivity2 extends ShareActivity {}
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.webapk.shell_apk;
/**
* Instance of a ShareActivity to support multiple share actions.
*/
public class ShareActivity3 extends ShareActivity {}
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.webapk.shell_apk;
/**
* Instance of a ShareActivity to support multiple share actions.
*/
public class ShareActivity4 extends ShareActivity {}
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