Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

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

Issue 2776243007: Enable WebVR presentation from Chrome Custom Tab (Closed)
Patch Set: rebase + address nit Created 3 years, 8 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 channels use "runtime permission" uses-permission-sdk-m which provides 29 channels use "runtime permission" uses-permission-sdk-m which provides
30 permission on Android M and later without a prompt. 30 permission on Android M and later without a prompt.
31 --> 31 -->
32 {% if channel in ['default'] %} 32 {% if channel in ['default'] %}
33 <uses-permission android:name="android.permission.BLUETOOTH"/> 33 <uses-permission android:name="android.permission.BLUETOOTH"/>
34 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> 34 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
35 <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAG ES"/> 35 <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAG ES"/>
36 {% endif %} 36 {% endif %}
37 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH"/> 37 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH"/>
38 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH_ADMIN"/> 38 <uses-permission-sdk-m android:name="android.permission.BLUETOOTH_ADMIN"/>
39 <uses-permission-sdk-m android:name="android.permission.REORDER_TASKS"/>
39 <uses-permission-sdk-m android:name="android.permission.REQUEST_INSTALL_PACK AGES"/> 40 <uses-permission-sdk-m android:name="android.permission.REQUEST_INSTALL_PACK AGES"/>
40 41
41 <uses-permission android:name="android.permission.CAMERA" /> 42 <uses-permission android:name="android.permission.CAMERA" />
42 <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICAT ION" /> 43 <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICAT ION" />
43 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> 44 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
44 <uses-permission android:name="android.permission.INTERNET"/> 45 <uses-permission android:name="android.permission.INTERNET"/>
45 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/> 46 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
46 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> 47 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
47 <uses-permission android:name="android.permission.NFC"/> 48 <uses-permission android:name="android.permission.NFC"/>
48 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> 49 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 android:exported="false" 359 android:exported="false"
359 android:windowSoftInputMode="adjustResize" 360 android:windowSoftInputMode="adjustResize"
360 android:launchMode="singleTask" 361 android:launchMode="singleTask"
361 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode" 362 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
362 android:hardwareAccelerated="false" 363 android:hardwareAccelerated="false"
363 {# We can only use blocks once in Jinja, for future substitutions we use 364 {# We can only use blocks once in Jinja, for future substitutions we use
364 self.supports_video_persistence(). #} 365 self.supports_video_persistence(). #}
365 {% block supports_video_persistence %} 366 {% block supports_video_persistence %}
366 {% endblock %} 367 {% endblock %}
367 > 368 >
368 <!--
369 See the VRChromeTabbedActivity alias below for an explanation of t his dummy intent
370 filter. We need to add these filters here as well, or non-presenti ng webVR pages will
371 trigger a daydream incompatible app message.
372 -->
373 <intent-filter>
374 <action android:name="org.chromium.chrome.browser.dummy.action" />
375 <category android:name="com.google.intent.category.DAYDREAM" />
376 <category android:name="com.google.intent.category.CARDBOARD" />
377 </intent-filter>
378 </activity> 369 </activity>
379
380 {% if enable_vr == "true" %}
381 <!--
382 TODO(mthiesse): Temporarily skip ChromeLauncherActivity when returni ng from Daydream
383 DON flow to avoid polluting metrics.
384 -->
385 <activity-alias android:name="org.chromium.chrome.browser.VRChromeTabbed Activity"
386 android:targetActivity="org.chromium.chrome.browser.ChromeTabbedActi vity"
387 android:enableVrMode="@string/gvr_vr_mode_component">
388 <!--
389 Daydream api categorizes an activity to three categories: Cardboar d only, hybrid
390 or Daydream. It does so by testing if intents can be resolved by t he activity
391 that requests it.
392 In Chrome, CTA is the activity that uses Daydream api and we want to be in hybrid
393 category. So add an intent filter that could pass Daydream tests h ere.
394 -->
395 <intent-filter>
396 <action android:name="org.chromium.chrome.browser.dummy.action" />
397 <category android:name="com.google.intent.category.DAYDREAM" />
398 <category android:name="com.google.intent.category.CARDBOARD" />
399 </intent-filter>
400 </activity-alias>
401 {% endif %}
402
403 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2" 370 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2"
404 android:theme="@style/TabbedModeTheme" 371 android:theme="@style/TabbedModeTheme"
405 android:exported="false" 372 android:exported="false"
406 android:windowSoftInputMode="adjustResize" 373 android:windowSoftInputMode="adjustResize"
407 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" 374 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
408 android:launchMode="singleTask" 375 android:launchMode="singleTask"
409 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize|uiMode" 376 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
410 android:hardwareAccelerated="false" 377 android:hardwareAccelerated="false"
411 {{ self.supports_video_persistence() }} 378 {{ self.supports_video_persistence() }}
412 > 379 >
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 974 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
1008 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 975 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
1009 The downstream manifest replaces this block, and hence replaces the list of media route 976 The downstream manifest replaces this block, and hence replaces the list of media route
1010 controllers with its own list. --> 977 controllers with its own list. -->
1011 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 978 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
1012 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 979 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
1013 980
1014 {% endblock %} 981 {% endblock %}
1015 </application> 982 </application>
1016 </manifest> 983 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698