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

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

Issue 2493333002: Move Java Blimp shell code to app subpackage (Closed)
Patch Set: Merge branch 'refs/heads/master' into blimp-shell-integration Created 4 years, 1 month 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/app/BUILD.gn ('k') | blimp/client/app/android/blimp_app_jni_registrar.cc » ('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_FINE_LOCATION"/> 10 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
11 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> 11 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
12 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> 12 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
13 <uses-permission android:name="android.permission.INTERNET"/> 13 <uses-permission android:name="android.permission.INTERNET"/>
14 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> 14 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
15 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> 15 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
16 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> 16 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
17 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/> 17 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
18 <application android:name="org.chromium.blimp.BlimpApplication" 18 <application android:name="org.chromium.blimp.app.BlimpApplication"
19 android:label="Blimp" 19 android:label="Blimp"
20 android:icon="@mipmap/app_icon"> 20 android:icon="@mipmap/app_icon">
21 <activity android:name="org.chromium.blimp.BlimpRendererActivity" 21 <activity android:name="org.chromium.blimp.app.BlimpRendererActivity"
22 android:launchMode="singleTask" 22 android:launchMode="singleTask"
23 android:theme="@style/Theme.AppCompat.Light.NoActionBar" 23 android:theme="@style/Theme.AppCompat.Light.NoActionBar"
24 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize" 24 android:configChanges="orientation|keyboardHidden|keyboard|scr eenSize"
25 android:windowSoftInputMode="adjustNothing" 25 android:windowSoftInputMode="adjustNothing"
26 android:hardwareAccelerated="true"> 26 android:hardwareAccelerated="true">
27 <intent-filter> 27 <intent-filter>
28 <action android:name="android.intent.action.MAIN" /> 28 <action android:name="android.intent.action.MAIN" />
29 <category android:name="android.intent.category.DEFAULT" /> 29 <category android:name="android.intent.category.DEFAULT" />
30 <category android:name="android.intent.category.LAUNCHER" /> 30 <category android:name="android.intent.category.LAUNCHER" />
31 <category android:name="android.intent.category.BROWSABLE" /> 31 <category android:name="android.intent.category.BROWSABLE" />
32 <category android:name="android.intent.category.APP_BROWSER" /> 32 <category android:name="android.intent.category.APP_BROWSER" />
33 </intent-filter> 33 </intent-filter>
34 <intent-filter> 34 <intent-filter>
35 <action android:name="android.intent.action.VIEW" /> 35 <action android:name="android.intent.action.VIEW" />
36 <category android:name="android.intent.category.DEFAULT" /> 36 <category android:name="android.intent.category.DEFAULT" />
37 <category android:name="android.intent.category.BROWSABLE" /> 37 <category android:name="android.intent.category.BROWSABLE" />
38 <data android:scheme="http" /> 38 <data android:scheme="http" />
39 <data android:scheme="https" /> 39 <data android:scheme="https" />
40 </intent-filter> 40 </intent-filter>
41 </activity> 41 </activity>
42 <activity android:name="org.chromium.blimp.settings.Preferences"/> 42 <activity android:name="org.chromium.blimp.app.settings.Preferences"/>
43 <activity android:name="org.chromium.blimp.BrowserRestartActivity" 43 <activity android:name="org.chromium.blimp.app.BrowserRestartActivity"
44 android:launchMode="singleInstance" 44 android:launchMode="singleInstance"
45 android:exported="false" 45 android:exported="false"
46 android:theme="@android:style/Theme.Translucent.NoTitleBar" 46 android:theme="@android:style/Theme.Translucent.NoTitleBar"
47 android:excludeFromRecents="true" 47 android:excludeFromRecents="true"
48 android:process=":browser_restart_process"> 48 android:process=":browser_restart_process">
49 </activity> 49 </activity>
50 <activity android:name="org.chromium.blimp.core.settings.MockPreferences " 50 <activity android:name="org.chromium.blimp.core.settings.MockPreferences "
51 android:launchMode="singleTask" 51 android:launchMode="singleTask"
52 android:theme="@style/Theme.AppCompat.Light"> 52 android:theme="@style/Theme.AppCompat.Light">
53 </activity> 53 </activity>
54 54
55 <meta-data android:name="com.google.android.gms.version" 55 <meta-data android:name="com.google.android.gms.version"
56 android:value="@integer/google_play_services_version" /> 56 android:value="@integer/google_play_services_version" />
57 </application> 57 </application>
58 </manifest> 58 </manifest>
OLDNEW
« no previous file with comments | « blimp/client/app/BUILD.gn ('k') | blimp/client/app/android/blimp_app_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698