| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 |
| 3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 | 4 |
| 5 Use of this source code is governed by a BSD-style license that can be | 5 Use of this source code is governed by a BSD-style license that can be |
| 6 found in the LICENSE file. | 6 found in the LICENSE file. |
| 7 --> | 7 --> |
| 8 | 8 |
| 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 10 package="org.chromium.chrome.testshell"> | 10 package="org.chromium.chrome.shell"> |
| 11 | 11 |
| 12 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> | 12 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> |
| 13 <permission android:name="org.chromium.chrome.testshell.permission.SANDBOX" | 13 <permission android:name="org.chromium.chrome.shell.permission.SANDBOX" |
| 14 android:protectionLevel="signature" /> | 14 android:protectionLevel="signature" /> |
| 15 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> | 15 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> |
| 16 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | 16 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 17 <uses-permission android:name="android.permission.CAMERA" /> | 17 <uses-permission android:name="android.permission.CAMERA" /> |
| 18 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> | 18 <uses-permission android:name="android.permission.GET_ACCOUNTS"/> |
| 19 <uses-permission android:name="android.permission.INTERNET"/> | 19 <uses-permission android:name="android.permission.INTERNET"/> |
| 20 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> | 20 <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> |
| 21 <uses-permission android:name="android.permission.RECORD_AUDIO"/> | 21 <uses-permission android:name="android.permission.RECORD_AUDIO"/> |
| 22 <uses-permission android:name="android.permission.VIBRATE"/> | 22 <uses-permission android:name="android.permission.VIBRATE"/> |
| 23 <uses-permission android:name="android.permission.WAKE_LOCK"/> | 23 <uses-permission android:name="android.permission.WAKE_LOCK"/> |
| 24 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> | 24 <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> |
| 25 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> | 25 <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> |
| 26 <uses-permission android:name="android.permission.USE_CREDENTIALS" /> | 26 <uses-permission android:name="android.permission.USE_CREDENTIALS" /> |
| 27 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | 27 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
| 28 <!-- Only Chrome can receive the messages and registration result for GCM --
> | 28 <!-- Only Chrome can receive the messages and registration result for GCM --
> |
| 29 <permission android:name="org.chromium.chrome.testshell.permission.C2D_MESSA
GE" | 29 <permission android:name="org.chromium.chrome.shell.permission.C2D_MESSAGE" |
| 30 android:protectionLevel="signature" /> | 30 android:protectionLevel="signature" /> |
| 31 <uses-permission android:name="org.chromium.chrome.testshell.permission.C2D_
MESSAGE" /> | 31 <uses-permission android:name="org.chromium.chrome.shell.permission.C2D_MESS
AGE" /> |
| 32 <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /
> | 32 <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /
> |
| 33 | 33 |
| 34 <application android:name="org.chromium.chrome.testshell.ChromiumTestShellAp
plication" | 34 <application android:name="org.chromium.chrome.shell.ChromiumTestShellApplic
ation" |
| 35 android:icon="@mipmap/app_icon" | 35 android:icon="@mipmap/app_icon" |
| 36 android:label="Chrome Shell"> | 36 android:label="Chrome Shell"> |
| 37 <activity android:name="org.chromium.chrome.testshell.ChromiumTestShellA
ctivity" | 37 <activity android:name="org.chromium.chrome.shell.ChromiumTestShellActiv
ity" |
| 38 android:launchMode="singleTask" | 38 android:launchMode="singleTask" |
| 39 android:theme="@android:style/Theme.Holo.Light.NoActionBar" | 39 android:theme="@android:style/Theme.Holo.Light.NoActionBar" |
| 40 android:configChanges="orientation|keyboardHidden|keyboard|scr
eenSize" | 40 android:configChanges="orientation|keyboardHidden|keyboard|scr
eenSize" |
| 41 android:hardwareAccelerated="true"> | 41 android:hardwareAccelerated="true"> |
| 42 <intent-filter> | 42 <intent-filter> |
| 43 <action android:name="android.intent.action.MAIN" /> | 43 <action android:name="android.intent.action.MAIN" /> |
| 44 <category android:name="android.intent.category.LAUNCHER" /> | 44 <category android:name="android.intent.category.LAUNCHER" /> |
| 45 </intent-filter> | 45 </intent-filter> |
| 46 </activity> | 46 </activity> |
| 47 <activity android:name="org.chromium.sync.test.util.MockGrantCredentials
PermissionActivity" | 47 <activity android:name="org.chromium.sync.test.util.MockGrantCredentials
PermissionActivity" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 android:isolatedProcess="true" | 122 android:isolatedProcess="true" |
| 123 android:exported="false" /> | 123 android:exported="false" /> |
| 124 | 124 |
| 125 <!-- Receiver for GCM messages. Rebroadcasts them locally for sync. --> | 125 <!-- Receiver for GCM messages. Rebroadcasts them locally for sync. --> |
| 126 <receiver android:exported="true" | 126 <receiver android:exported="true" |
| 127 android:name="com.google.ipc.invalidation.external.client.cont
rib.MultiplexingGcmListener$GCMReceiver" | 127 android:name="com.google.ipc.invalidation.external.client.cont
rib.MultiplexingGcmListener$GCMReceiver" |
| 128 android:permission="com.google.android.c2dm.permission.SEND"> | 128 android:permission="com.google.android.c2dm.permission.SEND"> |
| 129 <intent-filter> | 129 <intent-filter> |
| 130 <action android:name="com.google.android.c2dm.intent.RECEIVE" /> | 130 <action android:name="com.google.android.c2dm.intent.RECEIVE" /> |
| 131 <action android:name="com.google.android.c2dm.intent.REGISTRATIO
N" /> | 131 <action android:name="com.google.android.c2dm.intent.REGISTRATIO
N" /> |
| 132 <category android:name="org.chromium.chrome.testshell"/> | 132 <category android:name="org.chromium.chrome.shell"/> |
| 133 </intent-filter> | 133 </intent-filter> |
| 134 </receiver> | 134 </receiver> |
| 135 <service android:exported="false" | 135 <service android:exported="false" |
| 136 android:name="com.google.ipc.invalidation.external.client.contr
ib.MultiplexingGcmListener"> | 136 android:name="com.google.ipc.invalidation.external.client.contr
ib.MultiplexingGcmListener"> |
| 137 <meta-data android:name="sender_ids" | 137 <meta-data android:name="sender_ids" |
| 138 android:value="cloudprint.c2dm@gmail.com,ipc.invalidation
@gmail.com"/> | 138 android:value="cloudprint.c2dm@gmail.com,ipc.invalidation
@gmail.com"/> |
| 139 </service> | 139 </service> |
| 140 | 140 |
| 141 <!-- Notification service for sync. --> | 141 <!-- Notification service for sync. --> |
| 142 <meta-data android:name="ipc.invalidation.ticl.listener_service_class" | 142 <meta-data android:name="ipc.invalidation.ticl.listener_service_class" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 161 android:name="com.google.ipc.invalidation.ticl.android2.channel
.AndroidMessageReceiverService" | 161 android:name="com.google.ipc.invalidation.ticl.android2.channel
.AndroidMessageReceiverService" |
| 162 android:enabled="true"/> | 162 android:enabled="true"/> |
| 163 <receiver android:exported="false" | 163 <receiver android:exported="false" |
| 164 android:name="com.google.ipc.invalidation.ticl.android2.channe
l.AndroidMessageReceiverService$Receiver"> | 164 android:name="com.google.ipc.invalidation.ticl.android2.channe
l.AndroidMessageReceiverService$Receiver"> |
| 165 <intent-filter> | 165 <intent-filter> |
| 166 <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT
" /> | 166 <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT
" /> |
| 167 </intent-filter> | 167 </intent-filter> |
| 168 </receiver> | 168 </receiver> |
| 169 | 169 |
| 170 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide
r" | 170 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide
r" |
| 171 android:authorities="org.chromium.chrome.testshell" | 171 android:authorities="org.chromium.chrome.shell" |
| 172 android:exported="true" /> | 172 android:exported="true" /> |
| 173 | 173 |
| 174 <!-- Sync adapter for browser sync. --> | 174 <!-- Sync adapter for browser sync. --> |
| 175 <service android:exported="false" | 175 <service android:exported="false" |
| 176 android:name="org.chromium.chrome.testshell.sync.ChromiumTestSh
ellSyncAdapterService"> | 176 android:name="org.chromium.chrome.shell.sync.ChromiumTestShellS
yncAdapterService"> |
| 177 <intent-filter> | 177 <intent-filter> |
| 178 <action android:name="android.content.SyncAdapter" /> | 178 <action android:name="android.content.SyncAdapter" /> |
| 179 </intent-filter> | 179 </intent-filter> |
| 180 <meta-data android:name="android.content.SyncAdapter" | 180 <meta-data android:name="android.content.SyncAdapter" |
| 181 android:resource="@xml/syncadapter" /> | 181 android:resource="@xml/syncadapter" /> |
| 182 </service> | 182 </service> |
| 183 | 183 |
| 184 <!-- Broadcast receiver that will be notified of account changes. --> | 184 <!-- Broadcast receiver that will be notified of account changes. --> |
| 185 <receiver android:name="org.chromium.chrome.testshell.signin.AccountsCha
ngedReceiver"> | 185 <receiver android:name="org.chromium.chrome.shell.signin.AccountsChanged
Receiver"> |
| 186 <intent-filter> | 186 <intent-filter> |
| 187 <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" /
> | 187 <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" /
> |
| 188 </intent-filter> | 188 </intent-filter> |
| 189 </receiver> | 189 </receiver> |
| 190 </application> | 190 </application> |
| 191 </manifest> | 191 </manifest> |
| OLD | NEW |