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

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

Issue 2252123002: [Remoting Android] Remove Cardboard Code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reviewer's Feedback - Removed unused const and strings 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/android/client_java_tmpl.gni ('k') | 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 9655d85ede37922ea5d9d3677a034323a01ae537..976943f65b9eeb9d320fd4a1d0ba6c0fef56f4aa 100644
--- a/remoting/android/java/AndroidManifest.xml.jinja2
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
@@ -5,12 +5,6 @@
android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.INTERNET"/>
-{% 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.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-{% endif %}
<application android:label="@string/product_name_android"
android:name="org.chromium.chromoting.RemotingApplication"
@@ -20,9 +14,6 @@
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>
- <meta-data
- android:name="enable_cardboard"
- android:value="{{ ENABLE_CARDBOARD }}"/>
<activity android:name="org.chromium.chromoting.Chromoting"
android:configChanges="orientation|screenSize"
android:theme="@style/BaseTheme.NavigationDrawer"
@@ -48,15 +39,6 @@
</activity>
<activity android:name="org.chromium.chromoting.Desktop"
android:windowSoftInputMode="adjustResize"/>
-{% if ENABLE_CARDBOARD == "1" %}
- <activity android:name="org.chromium.chromoting.cardboard.DesktopActivity"
- android:windowSoftInputMode="adjustResize"
- android:screenOrientation="sensorLandscape">
- <intent-filter>
- <category android:name="com.google.intent.category.CARDBOARD" />
- </intent-filter>
- </activity>
- {% endif %}
<activity android:name="org.chromium.chromoting.help.HelpActivity"
android:configChanges="orientation|screenSize"
android:uiOptions="splitActionBarWhenNarrow">
« no previous file with comments | « remoting/android/client_java_tmpl.gni ('k') | remoting/android/java/res/layout/cardboard_desktop.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698