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

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

Issue 1190103002: Make lint fail builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix exported crash for ChromeShellTest Created 5 years, 6 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 | « content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2 ('k') | no next file » | 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 <application android:label="@string/product_name_android" 10 <application android:label="@string/product_name_android"
11 android:icon="@mipmap/logo_remote_desktop_launcher" 11 android:icon="@mipmap/logo_remote_desktop_launcher"
12 android:theme="@style/BaseTheme" 12 android:theme="@style/BaseTheme"
13 android:allowBackup="false"> 13 android:allowBackup="false">
14 <meta-data 14 <meta-data
15 android:name="com.google.android.gms.version" 15 android:name="com.google.android.gms.version"
16 android:value="@integer/google_play_services_version"/> 16 android:value="@integer/google_play_services_version"/>
17 <activity android:name="org.chromium.chromoting.Chromoting" 17 <activity android:name="org.chromium.chromoting.Chromoting"
18 android:configChanges="orientation|screenSize" 18 android:configChanges="orientation|screenSize"
19 android:theme="@style/BaseTheme.NavigationDrawer" 19 android:theme="@style/BaseTheme.NavigationDrawer"
20 android:launchMode="singleTask"> 20 android:launchMode="singleTask">
21 <intent-filter> 21 <intent-filter>
22 <action android:name="android.intent.action.MAIN"/> 22 <action android:name="android.intent.action.MAIN"/>
23 <category android:name="android.intent.category.LAUNCHER"/> 23 <category android:name="android.intent.category.LAUNCHER"/>
24 </intent-filter> 24 </intent-filter>
25 </activity> 25 </activity>
26 <activity 26 <activity
27 android:name="org.chromium.chromoting.ThirdPartyTokenFetcher$OAuthRe directActivity" 27 android:name="org.chromium.chromoting.ThirdPartyTokenFetcher$OAuthRe directActivity"
28 android:enabled="false" 28 android:enabled="false"
29 android:noHistory="true"> 29 android:noHistory="true">
30 <!-- TODO(kevinp): suppress once crbug.com/501593 is fixed. -->
31 <!--suppress AppIndexingError -->
30 <intent-filter> 32 <intent-filter>
31 <action android:name="android.intent.action.VIEW"/> 33 <action android:name="android.intent.action.VIEW"/>
32 <category android:name="android.intent.category.DEFAULT"/> 34 <category android:name="android.intent.category.DEFAULT"/>
33 <category android:name="android.intent.category.BROWSABLE"/> 35 <category android:name="android.intent.category.BROWSABLE"/>
34 <data android:scheme="{{ APK_PACKAGE_NAME }}"/> 36 <data android:scheme="{{ APK_PACKAGE_NAME }}"/>
35 <data android:path="/oauthredirect/"/> 37 <data android:path="/oauthredirect/"/>
36 </intent-filter> 38 </intent-filter>
37 </activity> 39 </activity>
38 <activity android:name="org.chromium.chromoting.Desktop" 40 <activity android:name="org.chromium.chromoting.Desktop"
39 android:configChanges="orientation|screenSize|keyboard|keyboardH idden" 41 android:configChanges="orientation|screenSize|keyboard|keyboardH idden"
40 android:theme="@style/BaseTheme.Desktop" 42 android:theme="@style/BaseTheme.Desktop"
41 android:windowSoftInputMode="adjustResize"/> 43 android:windowSoftInputMode="adjustResize"/>
42 <activity android:name="org.chromium.chromoting.HelpActivity" 44 <activity android:name="org.chromium.chromoting.HelpActivity"
43 android:configChanges="orientation|screenSize" 45 android:configChanges="orientation|screenSize"
44 android:uiOptions="splitActionBarWhenNarrow"/> 46 android:uiOptions="splitActionBarWhenNarrow"/>
45 </application> 47 </application>
46 </manifest> 48 </manifest>
OLDNEW
« no previous file with comments | « content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698