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

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

Issue 2941173002: Prevent "Incompatible App" message when entering VR. (Closed)
Patch Set: Resolve findbugs issue. Created 3 years, 5 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/vr_shell/VrShellDelegate.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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 </activity> 312 </activity>
313 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity" 313 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity"
314 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity" 314 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity"
315 android:exported="false"/> 315 android:exported="false"/>
316 316
317 <!-- Custom Tabs --> 317 <!-- Custom Tabs -->
318 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity" 318 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity"
319 android:theme="@style/MainTheme" 319 android:theme="@style/MainTheme"
320 android:exported="false" 320 android:exported="false"
321 {{ self.chrome_activity_common() }} 321 {{ self.chrome_activity_common() }}
322 {{ self.supports_video_persistence() }} > 322 {{ self.supports_video_persistence() }}
323 >
324 {{ self.supports_vr() }}
323 </activity> 325 </activity>
324 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity" 326 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity"
325 android:theme="@style/MainTheme" 327 android:theme="@style/MainTheme"
326 android:exported="false" 328 android:exported="false"
327 android:taskAffinity="" 329 android:taskAffinity=""
328 android:persistableMode="persistNever" 330 android:persistableMode="persistNever"
329 android:autoRemoveFromRecents="false" 331 android:autoRemoveFromRecents="false"
330 {{ self.chrome_activity_common() }} 332 {{ self.chrome_activity_common() }}
331 {{ self.supports_video_persistence() }} > 333 {{ self.supports_video_persistence() }}
334 >
335 {{ self.supports_vr() }}
332 </activity> 336 </activity>
333 {% for i in range(10) %} 337 {% for i in range(10) %}
334 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity{{ i }}" 338 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity{{ i }}"
335 android:theme="@style/MainTheme" 339 android:theme="@style/MainTheme"
336 android:icon="@mipmap/app_single_page_icon" 340 android:icon="@mipmap/app_single_page_icon"
337 android:exported="false" 341 android:exported="false"
338 android:launchMode="singleTask" 342 android:launchMode="singleTask"
339 android:persistableMode="persistNever" 343 android:persistableMode="persistNever"
340 android:taskAffinity="" 344 android:taskAffinity=""
341 {{ self.chrome_activity_common() }} 345 {{ self.chrome_activity_common() }}
342 {{ self.supports_video_persistence() }} > 346 {{ self.supports_video_persistence() }}
347 >
348 {{ self.supports_vr() }}
343 </activity> 349 </activity>
344 {% endfor %} 350 {% endfor %}
345 351
346 <!-- ChromeTabbedActivity related --> 352 <!-- ChromeTabbedActivity related -->
347 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity " 353 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity "
348 android:theme="@style/TabbedModeTheme" 354 android:theme="@style/TabbedModeTheme"
349 android:exported="false" 355 android:exported="false"
350 android:launchMode="singleTask" 356 android:launchMode="singleTask"
351 {# We can only use blocks once in Jinja, for future substitutions we use 357 {# We can only use blocks once in Jinja, for future substitutions we use
352 self.supports_video_persistence(). #} 358 self.supports_video_persistence(). #}
353 {% block supports_video_persistence %} 359 {% block supports_video_persistence %}
354 android:supportsPictureInPicture="true" 360 android:supportsPictureInPicture="true"
355 android:resizeableActivity="true" 361 android:resizeableActivity="true"
356 {% endblock %} 362 {% endblock %}
357 {% block chrome_activity_common %} 363 {% block chrome_activity_common %}
358 android:windowSoftInputMode="adjustResize" 364 android:windowSoftInputMode="adjustResize"
359 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode" 365 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
360 android:hardwareAccelerated="false" 366 android:hardwareAccelerated="false"
361 {% endblock %} 367 {% endblock %}
362 > 368 >
369 <!--
370 Daydream api categorizes an activity to three categories: Cardboar d only, hybrid
371 or Daydream. It does so by testing if intents can be resolved by t he activity
372 that requests it.
373 -->
374 {% block supports_vr %}
375 <intent-filter>
376 <action android:name="org.chromium.chrome.browser.dummy.action" />
377 <category android:name="com.google.intent.category.DAYDREAM" />
378 <category android:name="com.google.intent.category.CARDBOARD" />
379 </intent-filter>
380 {% endblock %}
363 </activity> 381 </activity>
364 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2" 382 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2"
365 android:theme="@style/TabbedModeTheme" 383 android:theme="@style/TabbedModeTheme"
366 android:exported="false" 384 android:exported="false"
367 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" 385 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
368 android:launchMode="singleTask" 386 android:launchMode="singleTask"
369 {{ self.chrome_activity_common() }} 387 {{ self.chrome_activity_common() }}
370 {{ self.supports_video_persistence() }}> 388 {{ self.supports_video_persistence() }}
389 >
390 {{ self.supports_vr() }}
371 </activity> 391 </activity>
372 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" 392 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity"
373 android:theme="@style/TabbedModeTheme" 393 android:theme="@style/TabbedModeTheme"
374 android:exported="false" 394 android:exported="false"
375 {{ self.chrome_activity_common() }}> 395 {{ self.chrome_activity_common() }}>
376 </activity> 396 </activity>
377 <activity android:name="org.chromium.chrome.browser.FullscreenWebContent sActivity" 397 <activity android:name="org.chromium.chrome.browser.FullscreenWebContent sActivity"
378 android:theme="@style/MainTheme" 398 android:theme="@style/MainTheme"
379 android:exported="false" 399 android:exported="false"
380 {{ self.chrome_activity_common() }} 400 {{ self.chrome_activity_common() }}
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager" 505 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager"
486 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity"> 506 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity">
487 </activity-alias> 507 </activity-alias>
488 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" 508 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty"
489 android:theme="@style/WebappTheme" 509 android:theme="@style/WebappTheme"
490 android:label="@string/webapp_activity_title" 510 android:label="@string/webapp_activity_title"
491 android:launchMode="singleTop" 511 android:launchMode="singleTop"
492 android:documentLaunchMode="intoExisting" 512 android:documentLaunchMode="intoExisting"
493 android:persistableMode="persistNever" 513 android:persistableMode="persistNever"
494 {{ self.supports_video_persistence() }} 514 {{ self.supports_video_persistence() }}
495 {{ self.chrome_activity_common() }}> 515 {{ self.chrome_activity_common() }}
516 >
517 {{ self.supports_vr() }}
496 </activity> 518 </activity>
497 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" 519 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity"
498 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" 520 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity"
499 android:label="@string/webapp_activity_title" 521 android:label="@string/webapp_activity_title"
500 {{ self.supports_video_persistence() }} > 522 {{ self.supports_video_persistence() }} >
501 </activity-alias> 523 </activity-alias>
502 {% for i in range(10) %} 524 {% for i in range(10) %}
503 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}" 525 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}"
504 android:theme="@style/WebappTheme" 526 android:theme="@style/WebappTheme"
505 android:icon="@mipmap/app_shortcut_icon" 527 android:icon="@mipmap/app_shortcut_icon"
506 android:label="@string/webapp_activity_title" 528 android:label="@string/webapp_activity_title"
507 android:launchMode="singleTask" 529 android:launchMode="singleTask"
508 android:persistableMode="persistNever" 530 android:persistableMode="persistNever"
509 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" 531 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}"
510 {{ self.supports_video_persistence() }} 532 {{ self.supports_video_persistence() }}
511 {{ self.chrome_activity_common() }}> 533 {{ self.chrome_activity_common() }}
534 >
535 {{ self.supports_vr() }}
512 </activity> 536 </activity>
513 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" 537 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}"
514 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" 538 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}"
515 android:icon="@mipmap/app_shortcut_icon" 539 android:icon="@mipmap/app_shortcut_icon"
516 android:label="@string/webapp_activity_title"> 540 android:label="@string/webapp_activity_title">
517 </activity-alias> 541 </activity-alias>
518 {% endfor %} 542 {% endfor %}
519 <!-- Activities for WebAPKs. --> 543 <!-- Activities for WebAPKs. -->
520 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty" 544 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty"
521 android:theme="@style/WebappTheme" 545 android:theme="@style/WebappTheme"
522 android:label="@string/webapp_activity_title" 546 android:label="@string/webapp_activity_title"
523 android:launchMode="singleTop" 547 android:launchMode="singleTop"
524 android:documentLaunchMode="intoExisting" 548 android:documentLaunchMode="intoExisting"
525 android:persistableMode="persistNever" 549 android:persistableMode="persistNever"
526 {{ self.supports_video_persistence() }} 550 {{ self.supports_video_persistence() }}
527 {{ self.chrome_activity_common() }}> 551 {{ self.chrome_activity_common() }}
552 >
553 {{ self.supports_vr() }}
528 </activity> 554 </activity>
529 {% for i in range(10) %} 555 {% for i in range(10) %}
530 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}" 556 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}"
531 android:theme="@style/WebappTheme" 557 android:theme="@style/WebappTheme"
532 android:icon="@mipmap/app_shortcut_icon" 558 android:icon="@mipmap/app_shortcut_icon"
533 android:label="@string/webapp_activity_title" 559 android:label="@string/webapp_activity_title"
534 android:launchMode="singleTask" 560 android:launchMode="singleTask"
535 android:persistableMode="persistNever" 561 android:persistableMode="persistNever"
536 android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{ { i }}" 562 android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{ { i }}"
537 {{ self.supports_video_persistence() }} 563 {{ self.supports_video_persistence() }}
538 {{ self.chrome_activity_common() }}> 564 {{ self.chrome_activity_common() }}
565 >
566 {{ self.supports_vr() }}
539 </activity> 567 </activity>
540 {% endfor %} 568 {% endfor %}
541 569
542 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" 570 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity"
543 android:theme="@style/MainTheme" 571 android:theme="@style/MainTheme"
544 android:label="Chrome.ExpandedControllerActivity" 572 android:label="Chrome.ExpandedControllerActivity"
545 android:hardwareAccelerated="true" 573 android:hardwareAccelerated="true"
546 android:launchMode="singleTask" 574 android:launchMode="singleTask"
547 android:noHistory="true" 575 android:noHistory="true"
548 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 576 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 1033 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
1006 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 1034 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
1007 The downstream manifest replaces this block, and hence replaces the list of media route 1035 The downstream manifest replaces this block, and hence replaces the list of media route
1008 controllers with its own list. --> 1036 controllers with its own list. -->
1009 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 1037 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
1010 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 1038 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
1011 1039
1012 {% endblock %} 1040 {% endblock %}
1013 </application> 1041 </application>
1014 </manifest> 1042 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698