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

Side by Side Diff: blimp/client/app/android/AndroidManifest.xml.jinja2

Issue 2261273002: Integrate UI with authentication flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Misc fixes/ Created 4 years, 3 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 | « blimp/client/DEPS ('k') | blimp/client/app/android/java/strings/android_blimp_strings.grd » ('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 2
3 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 3 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. --> 5 found in the LICENSE file. -->
6 6
7 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 7 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
8 package="{{manifest_package}}"> 8 package="{{manifest_package}}">
9 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" /> 9 <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
10 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> 10 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
11 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> 11 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
12 <uses-permission android:name="android.permission.INTERNET"/> 12 <uses-permission android:name="android.permission.INTERNET"/>
13 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> 13 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
14 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
14 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> 15 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
16 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
15 <application android:name="org.chromium.blimp.BlimpApplication" 17 <application android:name="org.chromium.blimp.BlimpApplication"
16 android:label="Blimp" 18 android:label="Blimp"
17 android:icon="@mipmap/app_icon"> 19 android:icon="@mipmap/app_icon">
18 <activity android:name="org.chromium.blimp.BlimpRendererActivity" 20 <activity android:name="org.chromium.blimp.BlimpRendererActivity"
19 android:launchMode="singleTask" 21 android:launchMode="singleTask"
20 android:theme="@android:style/Theme.Holo.Light.NoActionBar" 22 android:theme="@android:style/Theme.Holo.Light.NoActionBar"
21 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize" 23 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize"
22 android:windowSoftInputMode="adjustNothing" 24 android:windowSoftInputMode="adjustNothing"
23 android:hardwareAccelerated="true"> 25 android:hardwareAccelerated="true">
24 <intent-filter> 26 <intent-filter>
(...skipping 13 matching lines...) Expand all
38 </activity> 40 </activity>
39 <activity android:name="org.chromium.blimp.settings.Preferences"/> 41 <activity android:name="org.chromium.blimp.settings.Preferences"/>
40 <activity android:name="org.chromium.blimp.BrowserRestartActivity" 42 <activity android:name="org.chromium.blimp.BrowserRestartActivity"
41 android:launchMode="singleInstance" 43 android:launchMode="singleInstance"
42 android:exported="false" 44 android:exported="false"
43 android:theme="@android:style/Theme.Translucent.NoTitleBar" 45 android:theme="@android:style/Theme.Translucent.NoTitleBar"
44 android:excludeFromRecents="true" 46 android:excludeFromRecents="true"
45 android:process=":browser_restart_process"> 47 android:process=":browser_restart_process">
46 </activity> 48 </activity>
47 <activity android:name="org.chromium.blimp.core.settings.MockPreferences " 49 <activity android:name="org.chromium.blimp.core.settings.MockPreferences "
48 android:launchMode="singleTask"> 50 android:launchMode="singleTask"
51 android:theme="@style/Theme.AppCompat.Light">
49 </activity> 52 </activity>
50 53
51 <meta-data android:name="com.google.android.gms.version" 54 <meta-data android:name="com.google.android.gms.version"
52 android:value="@integer/google_play_services_version" /> 55 android:value="@integer/google_play_services_version" />
53 </application> 56 </application>
54 </manifest> 57 </manifest>
OLDNEW
« no previous file with comments | « blimp/client/DEPS ('k') | blimp/client/app/android/java/strings/android_blimp_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698