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

Unified Diff: remoting/android/java/AndroidManifest.xml.jinja2

Issue 1231153002: Add VR desktop activity structure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add cardboard desktop activity into conditional case Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/android/java/res/layout/cardboard_desktop.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/android/java/AndroidManifest.xml.jinja2
diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2
index 7c0e6ed11ac6fb4cbf856a1df3bc7f99140a5d78..a38931740d16d34d449d875b68988d6aa08a32ec 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
@@ -7,6 +7,12 @@
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+{% if ENABLE_CARDBOARD == "1" %}
+ <uses-permission android:name="android.permission.NFC" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+{% endif %}
+
<application android:label="@string/product_name_android"
android:icon="@mipmap/logo_remote_desktop_launcher"
android:theme="@style/BaseTheme"
@@ -41,6 +47,17 @@
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
android:theme="@style/BaseTheme.Desktop"
android:windowSoftInputMode="adjustResize"/>
+{% if ENABLE_CARDBOARD == "1" %}
+ <activity android:name="org.chromium.chromoting.CardboardDesktopActivity"
+ android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
+ android:theme="@style/BaseTheme.Desktop"
+ android:windowSoftInputMode="adjustResize"
+ android:screenOrientation="landscape">
+ <intent-filter>
+ <category android:name="com.google.intent.category.CARDBOARD" />
+ </intent-filter>
+ </activity>
+ {% endif %}
<activity android:name="org.chromium.chromoting.HelpActivity"
android:configChanges="orientation|screenSize"
android:uiOptions="splitActionBarWhenNarrow"/>
« no previous file with comments | « no previous file | remoting/android/java/res/layout/cardboard_desktop.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698