| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 {% endfor %} | 346 {% endfor %} |
| 347 | 347 |
| 348 <!-- ChromeTabbedActivity related --> | 348 <!-- ChromeTabbedActivity related --> |
| 349 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity
" | 349 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity
" |
| 350 android:theme="@style/TabbedModeTheme" | 350 android:theme="@style/TabbedModeTheme" |
| 351 android:exported="false" | 351 android:exported="false" |
| 352 android:windowSoftInputMode="adjustResize" | 352 android:windowSoftInputMode="adjustResize" |
| 353 android:launchMode="singleTask" | 353 android:launchMode="singleTask" |
| 354 android:configChanges="orientation|keyboardHidden|keyboard|screenSi
ze|mcc|mnc|screenLayout|smallestScreenSize" | 354 android:configChanges="orientation|keyboardHidden|keyboard|screenSi
ze|mcc|mnc|screenLayout|smallestScreenSize" |
| 355 android:hardwareAccelerated="false"> | 355 android:hardwareAccelerated="false"> |
| 356 {% set enable_webvr = enable_webvr|default(0) %} |
| 357 {% if enable_vr_shell == "true" or enable_webvr == "true" %} |
| 358 <intent-filter> |
| 359 <!-- Add a dummy action to match intent without any action. --> |
| 360 <action android:name="org.chromium.chrome.browser.dummy.action"
/> |
| 361 <!-- |
| 362 Daydream api categorizes an activity to three categories: Card
board only, hybrid |
| 363 or Daydream. It does so by testing if intents can be resolved
by the activity |
| 364 that requests it. |
| 365 In Chrome, CTA is the activity that uses Daydream api and we w
ant to be in hybrid |
| 366 category. So add an intent filter that could pass Daydream tes
ts here. |
| 367 --> |
| 368 <category android:name="com.google.intent.category.DAYDREAM" /> |
| 369 <category android:name="com.google.intent.category.CARDBOARD" /> |
| 370 </intent-filter> |
| 371 {% endif %} |
| 356 </activity> | 372 </activity> |
| 357 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity
2" | 373 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity
2" |
| 358 android:theme="@style/TabbedModeTheme" | 374 android:theme="@style/TabbedModeTheme" |
| 359 android:exported="false" | 375 android:exported="false" |
| 360 android:windowSoftInputMode="adjustResize" | 376 android:windowSoftInputMode="adjustResize" |
| 361 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" | 377 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" |
| 362 android:launchMode="singleTask" | 378 android:launchMode="singleTask" |
| 363 android:configChanges="orientation|keyboardHidden|keyboard|screenSi
ze|mcc|mnc|screenLayout|smallestScreenSize" | 379 android:configChanges="orientation|keyboardHidden|keyboard|screenSi
ze|mcc|mnc|screenLayout|smallestScreenSize" |
| 364 android:hardwareAccelerated="false"> | 380 android:hardwareAccelerated="false"> |
| 365 </activity> | 381 </activity> |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 choose the first MediaRouteController that can play it, so the orde
r of the list can be important. | 929 choose the first MediaRouteController that can play it, so the orde
r of the list can be important. |
| 914 The most specific MediaRouteControllers should be listed first, fol
lowed by more generic ones. | 930 The most specific MediaRouteControllers should be listed first, fol
lowed by more generic ones. |
| 915 The downstream manifest replaces this block, and hence replaces the
list of media route | 931 The downstream manifest replaces this block, and hence replaces the
list of media route |
| 916 controllers with its own list. --> | 932 controllers with its own list. --> |
| 917 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE
RS" | 933 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE
RS" |
| 918 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia
RouteController"/> | 934 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia
RouteController"/> |
| 919 | 935 |
| 920 {% endblock %} | 936 {% endblock %} |
| 921 </application> | 937 </application> |
| 922 </manifest> | 938 </manifest> |
| OLD | NEW |