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

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: fix naming convention 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
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..55d04196aa43b53d50191cab1e3bd27adc35af20 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
@@ -6,7 +6,10 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.NFC" />
Sergey Ulanov 2015/07/13 20:21:51 Looking again at this I think these new permission
shichengfeng 2015/07/13 23:00:01 Done.
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application android:label="@string/product_name_android"
android:icon="@mipmap/logo_remote_desktop_launcher"
android:theme="@style/BaseTheme"
@@ -41,6 +44,15 @@
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
android:theme="@style/BaseTheme.Desktop"
android:windowSoftInputMode="adjustResize"/>
+ <activity android:name="org.chromium.chromoting.VRDesktop"
Sergey Ulanov 2015/07/13 20:21:51 Update class name here too?
shichengfeng 2015/07/13 23:00:01 Done.
+ 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>
<activity android:name="org.chromium.chromoting.HelpActivity"
android:configChanges="orientation|screenSize"
android:uiOptions="splitActionBarWhenNarrow"/>

Powered by Google App Engine
This is Rietveld 408576698