Commit fa286b9d authored by pkotwicz's avatar pkotwicz Committed by Commit bot

Move WebAPK <meta-data> to org.chromium.webapk.shell_apk namespace

BUG=631063

Review-Url: https://codereview.chromium.org/2193683003
Cr-Commit-Position: refs/heads/master@{#408637}
parent e72182e9
...@@ -26,16 +26,20 @@ import java.io.ByteArrayOutputStream; ...@@ -26,16 +26,20 @@ import java.io.ByteArrayOutputStream;
* Launches Chrome in WebAPK mode. * Launches Chrome in WebAPK mode.
*/ */
public class HostBrowserLauncher { public class HostBrowserLauncher {
private static final String META_DATA_RUNTIME_HOST = "runtimeHost"; private static final String META_DATA_RUNTIME_HOST =
private static final String META_DATA_START_URL = "startUrl"; "org.chromium.webapk.shell_apk.runtimeHost";
private static final String META_DATA_NAME = "name"; private static final String META_DATA_START_URL = "org.chromium.webapk.shell_apk.startUrl";
private static final String META_DATA_SCOPE = "scope"; private static final String META_DATA_NAME = "org.chromium.webapk.shell_apk.name";
private static final String META_DATA_DISPLAY_MODE = "displayMode"; private static final String META_DATA_SCOPE = "org.chromium.webapk.shell_apk.scope";
private static final String META_DATA_ORIENTATION = "orientation"; private static final String META_DATA_DISPLAY_MODE =
private static final String META_DATA_THEME_COLOR = "themeColor"; "org.chromium.webapk.shell_apk.displayMode";
private static final String META_DATA_BACKGROUND_COLOR = "backgroundColor"; private static final String META_DATA_ORIENTATION = "org.chromium.webapk.shell_apk.orientation";
private static final String META_DATA_ICON_URL = "iconUrl"; private static final String META_DATA_THEME_COLOR = "org.chromium.webapk.shell_apk.themeColor";
private static final String META_DATA_WEB_MANIFEST_URL = "webManifestUrl"; private static final String META_DATA_BACKGROUND_COLOR =
"org.chromium.webapk.shell_apk.backgroundColor";
private static final String META_DATA_ICON_URL = "org.chromium.webapk.shell_apk.iconUrl";
private static final String META_DATA_WEB_MANIFEST_URL =
"org.chromium.webapk.shell_apk.webManifestUrl";
// This value is equal to kInvalidOrMissingColor in the C++ content::Manifest struct. // This value is equal to kInvalidOrMissingColor in the C++ content::Manifest struct.
private static final long MANIFEST_COLOR_INVALID_OR_MISSING = ((long) Integer.MAX_VALUE) + 1; private static final long MANIFEST_COLOR_INVALID_OR_MISSING = ((long) Integer.MAX_VALUE) + 1;
......
...@@ -36,16 +36,16 @@ ...@@ -36,16 +36,16 @@
<category android:name="android.intent.category.NOTIFICATION_PREFERENCES"/> <category android:name="android.intent.category.NOTIFICATION_PREFERENCES"/>
</intent-filter> </intent-filter>
</activity> </activity>
<meta-data android:name="runtimeHost" android:value="{{ runtime_host }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.runtimeHost" android:value="{{ runtime_host }}" />
<meta-data android:name="startUrl" android:value="{{ start_url }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.startUrl" android:value="{{ start_url }}" />
<meta-data android:name="name" android:value="{{ name }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.name" android:value="{{ name }}" />
<meta-data android:name="scope" android:value="{{ scope_url }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.scope" android:value="{{ scope_url }}" />
<meta-data android:name="displayMode" android:value="{{ display_mode }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.displayMode" android:value="{{ display_mode }}" />
<meta-data android:name="orientation" android:value="{{ orientation }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.orientation" android:value="{{ orientation }}" />
<meta-data android:name="themeColor" android:value="{{ theme_color }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.themeColor" android:value="{{ theme_color }}" />
<meta-data android:name="backgroundColor" android:value="{{ background_color }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.backgroundColor" android:value="{{ background_color }}" />
<meta-data android:name="iconUrl" android:value="{{ icon_url }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.iconUrl" android:value="{{ icon_url }}" />
<meta-data android:name="webManifestUrl" android:value="{{ web_manifest_url }}" /> <meta-data android:name="org.chromium.webapk.shell_apk.webManifestUrl" android:value="{{ web_manifest_url }}" />
<service <service
android:name="org.chromium.webapk.shell_apk.WebApkServiceFactory" android:name="org.chromium.webapk.shell_apk.WebApkServiceFactory"
android:exported="true" android:exported="true"
......
...@@ -36,7 +36,7 @@ public class MainActivity extends Activity { ...@@ -36,7 +36,7 @@ public class MainActivity extends Activity {
"REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB"; "REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB";
// Key for start URL in Android Manifest. // Key for start URL in Android Manifest.
private static final String META_DATA_START_URL = "startUrl"; private static final String META_DATA_START_URL = "org.chromium.webapk.shell_apk.startUrl";
/** /**
* Key for passing app icon id. * Key for passing app icon id.
......
...@@ -50,7 +50,7 @@ public class WebApkUtils { ...@@ -50,7 +50,7 @@ public class WebApkUtils {
ApplicationInfo ai = context.getPackageManager().getApplicationInfo( ApplicationInfo ai = context.getPackageManager().getApplicationInfo(
context.getPackageName(), PackageManager.GET_META_DATA); context.getPackageName(), PackageManager.GET_META_DATA);
Bundle bundle = ai.metaData; Bundle bundle = ai.metaData;
hostPackage = bundle.getString("runtimeHost"); hostPackage = bundle.getString("org.chromium.webapk.shell_apk.runtimeHost");
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
......
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