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

Side by Side Diff: remoting/android/java/AndroidManifest.xml.jinja2

Issue 1257283007: Voice input (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improve documentation. Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java » ('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" %} 10 {% if ENABLE_CARDBOARD == "1" %}
11 <uses-permission android:name="android.permission.NFC" /> 11 <uses-permission android:name="android.permission.NFC" />
12 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> 12 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
13 <uses-permission android:name="android.permission.RECORD_AUDIO" />
13 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 14 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
14 {% endif %} 15 {% endif %}
15 16
16 <application android:label="@string/product_name_android" 17 <application android:label="@string/product_name_android"
17 android:icon="@mipmap/logo_remote_desktop_launcher" 18 android:icon="@mipmap/logo_remote_desktop_launcher"
18 android:theme="@style/BaseTheme" 19 android:theme="@style/BaseTheme"
19 android:allowBackup="false"> 20 android:allowBackup="false">
20 <meta-data 21 <meta-data
21 android:name="com.google.android.gms.version" 22 android:name="com.google.android.gms.version"
22 android:value="@integer/google_play_services_version"/> 23 android:value="@integer/google_play_services_version"/>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 <intent-filter> 58 <intent-filter>
58 <category android:name="com.google.intent.category.CARDBOARD" /> 59 <category android:name="com.google.intent.category.CARDBOARD" />
59 </intent-filter> 60 </intent-filter>
60 </activity> 61 </activity>
61 {% endif %} 62 {% endif %}
62 <activity android:name="org.chromium.chromoting.HelpActivity" 63 <activity android:name="org.chromium.chromoting.HelpActivity"
63 android:configChanges="orientation|screenSize" 64 android:configChanges="orientation|screenSize"
64 android:uiOptions="splitActionBarWhenNarrow"/> 65 android:uiOptions="splitActionBarWhenNarrow"/>
65 </application> 66 </application>
66 </manifest> 67 </manifest>
OLDNEW
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698