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

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

Issue 2252103002: Introduce ChromeVR to Chrome on Android (behind a build flag) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaes and address 2 in 3 reviews Created 4 years, 4 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
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 <uses-permission android:name="android.permission.NFC"/> 45 <uses-permission android:name="android.permission.NFC"/>
46 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> 46 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
47 <uses-permission android:name="android.permission.READ_SYNC_STATS"/> 47 <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
48 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> 48 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
49 <uses-permission android:name="android.permission.RECORD_AUDIO"/> 49 <uses-permission android:name="android.permission.RECORD_AUDIO"/>
50 <uses-permission android:name="android.permission.USE_CREDENTIALS"/> 50 <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
51 <uses-permission android:name="android.permission.VIBRATE"/> 51 <uses-permission android:name="android.permission.VIBRATE"/>
52 <uses-permission android:name="android.permission.WAKE_LOCK"/> 52 <uses-permission android:name="android.permission.WAKE_LOCK"/>
53 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> 53 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
54 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/> 54 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
55 {% set enable_vr_shell = enable_vr_shell|default(0) %}
56 {% if enable_vr_shell == "true" %}
57 <!-- Required to read the paired viewer's distortion parameters. -->
58 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
59 {% endif %}
55 60
56 <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" a ndroid:protectionLevel="signature" /> 61 <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" a ndroid:protectionLevel="signature" />
57 <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKM ARK_FOLDERS" android:protectionLevel="signatureOrSystem" /> 62 <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKM ARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
58 <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protecti onLevel="signatureOrSystem" /> 63 <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protecti onLevel="signatureOrSystem" />
59 <!-- Only chrome can receive the messages and registration result --> 64 <!-- Only chrome can receive the messages and registration result -->
60 <permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE" 65 <permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE"
61 android:protectionLevel="signature" /> 66 android:protectionLevel="signature" />
62 <permission android:name="{{ manifest_package }}.permission.DEBUG" 67 <permission android:name="{{ manifest_package }}.permission.DEBUG"
63 android:label="Debug web pages" 68 android:label="Debug web pages"
64 android:permissionGroup="android.permission-group.DEVELOPMENT_TO OLS" 69 android:permissionGroup="android.permission-group.DEVELOPMENT_TO OLS"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 <intent-filter> 154 <intent-filter>
150 <action android:name="android.intent.action.MAIN" /> 155 <action android:name="android.intent.action.MAIN" />
151 <category android:name="android.intent.category.DEFAULT" /> 156 <category android:name="android.intent.category.DEFAULT" />
152 <category android:name="android.intent.category.LAUNCHER" /> 157 <category android:name="android.intent.category.LAUNCHER" />
153 <category android:name="android.intent.category.BROWSABLE" /> 158 <category android:name="android.intent.category.BROWSABLE" />
154 <category android:name="android.intent.category.APP_BROWSER" /> 159 <category android:name="android.intent.category.APP_BROWSER" />
155 <category android:name="android.intent.category.NOTIFICATION_PRE FERENCES" /> 160 <category android:name="android.intent.category.NOTIFICATION_PRE FERENCES" />
156 {% if channel in ['dev', 'canary', 'default'] %} 161 {% if channel in ['dev', 'canary', 'default'] %}
157 <category android:name="android.intent.category.MULTIWINDOW_LAUN CHER" /> 162 <category android:name="android.intent.category.MULTIWINDOW_LAUN CHER" />
158 {% endif %} 163 {% endif %}
159 {% set enable_vr_shell = enable_vr_shell|default(0) %}
160 {% if enable_vr_shell == "true" %}
161 <!-- Show icon in Daydream app launcher. -->
162 <category android:name="com.google.intent.category.DAYDREAM" />
163 {% endif %}
164 </intent-filter> 164 </intent-filter>
165 <!-- Matches the common case of intents with no MIME type. 165 <!-- Matches the common case of intents with no MIME type.
166 Make sure to keep in sync with the next filter. --> 166 Make sure to keep in sync with the next filter. -->
167 <intent-filter> 167 <intent-filter>
168 <action android:name="android.intent.action.VIEW" /> 168 <action android:name="android.intent.action.VIEW" />
169 <category android:name="android.intent.category.DEFAULT" /> 169 <category android:name="android.intent.category.DEFAULT" />
170 <category android:name="android.intent.category.BROWSABLE" /> 170 <category android:name="android.intent.category.BROWSABLE" />
171 {% if channel in ['stable', 'default'] %}<data android:scheme="g ooglechrome" />{% endif %} 171 {% if channel in ['stable', 'default'] %}<data android:scheme="g ooglechrome" />{% endif %}
172 <data android:scheme="http" /> 172 <data android:scheme="http" />
173 <data android:scheme="https" /> 173 <data android:scheme="https" />
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 338
339 <!-- ChromeTabbedActivity related --> 339 <!-- ChromeTabbedActivity related -->
340 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity " 340 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity "
341 android:theme="@style/TabbedModeTheme" 341 android:theme="@style/TabbedModeTheme"
342 android:exported="false" 342 android:exported="false"
343 android:windowSoftInputMode="adjustResize" 343 android:windowSoftInputMode="adjustResize"
344 android:launchMode="singleTask" 344 android:launchMode="singleTask"
345 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize" 345 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize"
346 android:hardwareAccelerated="false"> 346 android:hardwareAccelerated="false">
347 </activity> 347 </activity>
348 {% if enable_vr_shell == "true" %}
349 <activity android:name="org.chromium.chrome.browser.ChromeVrActivity"
350 android:theme="@style/TabbedModeTheme"
351 android:exported="false"
352 android:windowSoftInputMode="stateAlwaysHidden"
353 android:launchMode="singleTask"
354 android:screenOrientation="landscape"
355 android:hardwareAccelerated="false">
356 </activity>
357 <activity-alias android:name="com.google.android.apps.chrome.VrMain"
Maria 2016/08/24 00:06:07 why do you need an activity alias for this? Why no
bshe 2016/08/24 13:47:40 huh. I remember had problem with launching ChromeV
358 android:targetActivity="org.chromium.chrome.browser.ChromeVrActivity "
359 android:exported="true">
360 <intent-filter>
361 <action android:name="android.intent.action.MAIN" />
362 <category android:name="android.intent.category.LAUNCHER" />
363 <!-- Show icon in Daydream app launcher. -->
364 <category android:name="com.google.intent.category.DAYDREAM" />
365 </intent-filter>
366 </activity-alias>
367 {% endif %}
348 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2" 368 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2"
349 android:theme="@style/TabbedModeTheme" 369 android:theme="@style/TabbedModeTheme"
350 android:exported="false" 370 android:exported="false"
351 android:windowSoftInputMode="adjustResize" 371 android:windowSoftInputMode="adjustResize"
352 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" 372 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
353 android:launchMode="singleTask" 373 android:launchMode="singleTask"
354 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize" 374 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize"
355 android:hardwareAccelerated="false"> 375 android:hardwareAccelerated="false">
356 </activity> 376 </activity>
357 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" 377 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity"
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 930 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
911 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 931 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
912 The downstream manifest replaces this block, and hence replaces the list of media route 932 The downstream manifest replaces this block, and hence replaces the list of media route
913 controllers with its own list. --> 933 controllers with its own list. -->
914 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 934 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
915 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 935 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
916 936
917 {% endblock %} 937 {% endblock %}
918 </application> 938 </application>
919 </manifest> 939 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698