chrome/android/java/AndroidManifest.xml - Issue 2701333002: Add integration tests for WebAPKs

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 2701333002: Add integration tests for WebAPKs (Closed)

Patch Set: Merge branch 'remove_load_url' into integration_test Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« chrome/android/BUILD.gn ('K') | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java » ('j') | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/TestWebApkActivity.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.

3 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <!--	6 <!--

7 Note: This is a jinja2 template, processed at build time into the final manifest .	7 Note: This is a jinja2 template, processed at build time into the final manifest .

8	8

9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden	9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden

10 by a child template that "extends" this file.	10 by a child template that "extends" this file.

(...skipping 919 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
930 This is here, rather than in code, since it varies between upstream and downstream,	930 This is here, rather than in code, since it varies between upstream and downstream,

931 yet we need this list of classes in the notification service, which belongs upstream	931 yet we need this list of classes in the notification service, which belongs upstream

932 and doesn't run the downstream startup code. The Cast code will, fo r each media element,	932 and doesn't run the downstream startup code. The Cast code will, fo r each media element,

933 choose the first MediaRouteController that can play it, so the orde r of the list can be important.	933 choose the first MediaRouteController that can play it, so the orde r of the list can be important.

934 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.	934 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.

935 The downstream manifest replaces this block, and hence replaces the list of media route	935 The downstream manifest replaces this block, and hence replaces the list of media route

936 controllers with its own list. -->	936 controllers with its own list. -->

937 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"	937 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"

938 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>	938 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>

939	939

940 {% endblock %}	940 {% endblock %}

	941

	942 <activity android:name="org.chromium.chrome.browser.webapps.TestWebApkAc tivity"
	gone 2017/02/21 22:31:50 Eh, I am strongly against adding a test-specific A Eh, I am strongly against adding a test-specific Activity to the real manifest -- we'll never be able to remove it. Will it work if it's in chrome/android/javatests/AndroidManifest.xml instead? pkotwicz 2017/02/24 23:49:55 That's what I meant to do. Thank you very much for That's what I meant to do. Thank you very much for catching! I ended up removing TestWebApkActivity. Instrumentation#startActivitySync() does not like activities defined in the test application (instead of defined in the application under test) I have now added a static method WebApkUpdateManager#setUpdatesEnabledForTesting()
	943 android:theme="@style/WebappTheme"

	944 android:label="@string/webapp_activity_title"

	945 android:launchMode="singleTop"

	946 android:documentLaunchMode="intoExisting"

	947 android:windowSoftInputMode="adjustResize"

	948 android:persistableMode="persistNever"

	949 android:hardwareAccelerated="false"

	950 android:configChanges="orientation\|keyboardHidden\|keyboard\|screenSiz e\|mcc\|mnc\|screenLayout\|smallestScreenSize">

	951 </activity>

941 </application>	952 </application>

942 </manifest>	953 </manifest>

OLD	NEW