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

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

Issue 337013002: Third Party Authentication for Android Part III - Android OAuth2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix indentation Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/Chromoting.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="14"/> 5 android:targetSdkVersion="14"/>
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="@drawable/chromoting128" 11 android:icon="@drawable/chromoting128"
12 android:theme="@android:style/Theme.Holo"> 12 android:theme="@android:style/Theme.Holo">
13 <activity android:name="org.chromium.chromoting.Chromoting" 13 <activity android:name="org.chromium.chromoting.Chromoting"
14 android:configChanges="orientation|screenSize" 14 android:configChanges="orientation|screenSize"
15 android:theme="@style/MainTheme"> 15 android:theme="@style/MainTheme"
16 android:launchMode="singleTask">
16 <intent-filter> 17 <intent-filter>
17 <action android:name="android.intent.action.MAIN"/> 18 <action android:name="android.intent.action.MAIN"/>
18 <category android:name="android.intent.category.LAUNCHER"/> 19 <category android:name="android.intent.category.LAUNCHER"/>
19 </intent-filter> 20 </intent-filter>
20 </activity> 21 </activity>
22 <activity
23 android:name="org.chromium.chromoting.ThirdPartyTokenFetcher$OAuthRe directActivity"
24 android:enabled="false"
25 android:noHistory="true">
26 <intent-filter>
27 <action android:name="android.intent.action.VIEW"/>
28 <category android:name="android.intent.category.DEFAULT"/>
29 <category android:name="android.intent.category.BROWSABLE"/>
30 <data android:scheme="{{ APK_PACKAGE_NAME }}"/>
31 <data android:host="oauthredirect"/>
32 </intent-filter>
33 </activity>
21 <activity android:name="org.chromium.chromoting.Desktop" 34 <activity android:name="org.chromium.chromoting.Desktop"
22 android:configChanges="orientation|screenSize" 35 android:configChanges="orientation|screenSize"
23 android:windowSoftInputMode="adjustResize"/> 36 android:windowSoftInputMode="adjustResize"/>
24 <activity android:name="org.chromium.chromoting.HelpActivity" 37 <activity android:name="org.chromium.chromoting.HelpActivity"
25 android:configChanges="orientation|screenSize" 38 android:configChanges="orientation|screenSize"
26 android:uiOptions="splitActionBarWhenNarrow"/> 39 android:uiOptions="splitActionBarWhenNarrow"/>
27 </application> 40 </application>
28 </manifest> 41 </manifest>
OLDNEW
« no previous file with comments | « no previous file | remoting/android/java/src/org/chromium/chromoting/Chromoting.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698