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

Side by Side 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: improve documentation 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 unified diff | Download patch
« no previous file with comments | « no previous file | remoting/android/java/res/layout/vr_desktop.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="{{ APK_PACKAGE_NAME }}"> 3 package="{{ APK_PACKAGE_NAME }}">
4 <uses-sdk android:minSdkVersion="14" 4 <uses-sdk android:minSdkVersion="14"
5 android:targetSdkVersion="21"/> 5 android:targetSdkVersion="21"/>
6 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> 6 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
7 <uses-permission android:name="android.permission.INTERNET"/> 7 <uses-permission android:name="android.permission.INTERNET"/>
8 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/> 8 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
9 <uses-permission android:name="android.permission.USE_CREDENTIALS"/> 9 <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
10 {% if ENABLE_CARDBOARD == "1" %}
11 <uses-permission android:name="android.permission.NFC" />
12 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
13 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
14 {% endif %}
15
10 <application android:label="@string/product_name_android" 16 <application android:label="@string/product_name_android"
11 android:icon="@mipmap/logo_remote_desktop_launcher" 17 android:icon="@mipmap/logo_remote_desktop_launcher"
12 android:theme="@style/BaseTheme" 18 android:theme="@style/BaseTheme"
13 android:allowBackup="false"> 19 android:allowBackup="false">
14 <meta-data 20 <meta-data
15 android:name="com.google.android.gms.version" 21 android:name="com.google.android.gms.version"
16 android:value="@integer/google_play_services_version"/> 22 android:value="@integer/google_play_services_version"/>
17 <activity android:name="org.chromium.chromoting.Chromoting" 23 <activity android:name="org.chromium.chromoting.Chromoting"
18 android:configChanges="orientation|screenSize" 24 android:configChanges="orientation|screenSize"
19 android:theme="@style/BaseTheme.NavigationDrawer" 25 android:theme="@style/BaseTheme.NavigationDrawer"
(...skipping 14 matching lines...) Expand all
34 <category android:name="android.intent.category.DEFAULT"/> 40 <category android:name="android.intent.category.DEFAULT"/>
35 <category android:name="android.intent.category.BROWSABLE"/> 41 <category android:name="android.intent.category.BROWSABLE"/>
36 <data android:scheme="{{ APK_PACKAGE_NAME }}"/> 42 <data android:scheme="{{ APK_PACKAGE_NAME }}"/>
37 <data android:path="/oauthredirect/"/> 43 <data android:path="/oauthredirect/"/>
38 </intent-filter> 44 </intent-filter>
39 </activity> 45 </activity>
40 <activity android:name="org.chromium.chromoting.Desktop" 46 <activity android:name="org.chromium.chromoting.Desktop"
41 android:configChanges="orientation|screenSize|keyboard|keyboardH idden" 47 android:configChanges="orientation|screenSize|keyboard|keyboardH idden"
42 android:theme="@style/BaseTheme.Desktop" 48 android:theme="@style/BaseTheme.Desktop"
43 android:windowSoftInputMode="adjustResize"/> 49 android:windowSoftInputMode="adjustResize"/>
50 <activity android:name="org.chromium.chromoting.CardboardDesktopActivity "
51 android:configChanges="orientation|screenSize|keyboard|keyboardH idden"
52 android:theme="@style/BaseTheme.Desktop"
53 android:windowSoftInputMode="adjustResize"
54 android:screenOrientation="landscape">
55 <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.
56 <category android:name="com.google.intent.category.CARDBOARD" />
57 </intent-filter>
58 </activity>
44 <activity android:name="org.chromium.chromoting.HelpActivity" 59 <activity android:name="org.chromium.chromoting.HelpActivity"
45 android:configChanges="orientation|screenSize" 60 android:configChanges="orientation|screenSize"
46 android:uiOptions="splitActionBarWhenNarrow"/> 61 android:uiOptions="splitActionBarWhenNarrow"/>
47 </application> 62 </application>
48 </manifest> 63 </manifest>
OLDNEW
« no previous file with comments | « no previous file | remoting/android/java/res/layout/vr_desktop.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698