Chromium Code Reviews| 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..87b2dba98f2635f46c6088f94c9921bf1b2e3f0b 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,15 @@ |
| android:configChanges="orientation|screenSize|keyboard|keyboardHidden" |
| android:theme="@style/BaseTheme.Desktop" |
| android:windowSoftInputMode="adjustResize"/> |
| + <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> |
|
Lambros
2015/07/14 18:20:57
This intent filter needs to be in the ENABLE_CARDB
shichengfeng
2015/07/14 19:19:48
Done.
|
| + <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"/> |