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

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

Issue 2451193002: Fix imcompatible app warning when insert to DayDream headset (Closed)
Patch Set: Add webvr flag check Created 4 years, 1 month 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
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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
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" />
Maria 2016/10/26 20:10:27 Why does a dummy name allow to match intent withou
bshe 2016/10/26 20:51:46 Based on this doc: https://developer.android.com/g
361 <category android:name="com.google.intent.category.DAYDREAM" />
Maria 2016/10/26 20:10:27 Not too familiar with this -- I have a few questio
mthiesse 2016/10/26 20:15:21 I actually just had a discussion with Biao, and we
bshe 2016/10/26 20:51:46 This won't make Chrome appear in the launcher. To
bshe 2016/10/26 20:51:46 So Daydream will try to test if their intents can
Maria 2016/10/26 21:07:24 Ok, can you add this as a comment here -- I think
bshe 2016/10/27 15:01:15 Done.
362 <category android:name="com.google.intent.category.CARDBOARD" />
363 </intent-filter>
364 {% endif %}
356 </activity> 365 </activity>
357 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2" 366 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2"
358 android:theme="@style/TabbedModeTheme" 367 android:theme="@style/TabbedModeTheme"
359 android:exported="false" 368 android:exported="false"
360 android:windowSoftInputMode="adjustResize" 369 android:windowSoftInputMode="adjustResize"
361 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" 370 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
362 android:launchMode="singleTask" 371 android:launchMode="singleTask"
363 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize" 372 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize"
364 android:hardwareAccelerated="false"> 373 android:hardwareAccelerated="false">
365 </activity> 374 </activity>
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 922 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. 923 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 924 The downstream manifest replaces this block, and hence replaces the list of media route
916 controllers with its own list. --> 925 controllers with its own list. -->
917 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 926 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
918 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 927 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
919 928
920 {% endblock %} 929 {% endblock %}
921 </application> 930 </application>
922 </manifest> 931 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698