Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 |
| 3 <!-- Copyright 2013 The Chromium Authors. All rights reserved. | 3 <!-- Copyright 2013 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.android_webview.shell"> | 10 package="org.chromium.android_webview.shell"> |
| 11 | 11 |
| 12 <application android:name="org.chromium.android_webview.shell.AwShellApplicati on" | 12 <application android:name="org.chromium.android_webview.shell.AwShellApplicati on" |
| 13 android:label="AwShellApplication" | 13 android:label="AwShellApplication"> |
| 14 android:hardwareAccelerated="true"> | |
|
boliu
2014/11/04 18:30:24
Hmm...have to be *very careful* here to make sure
boliu
2014/11/04 21:53:26
Yeah this turned off hardware acceleration everywh
Ignacio Solla
2014/11/05 11:03:22
I have moved the change in PS6 to the testing code
Ignacio Solla
2014/11/05 11:03:22
Acknowledged.
| |
| 15 <activity android:name="org.chromium.android_webview.shell.AwShellActivity" | 14 <activity android:name="org.chromium.android_webview.shell.AwShellActivity" |
| 16 android:label="Android WebView Test Shell" | 15 android:label="Android WebView Test Shell" |
| 17 android:configChanges="orientation|keyboardHidden|keyboard|screenSize"> | 16 android:configChanges="orientation|keyboardHidden|keyboard|screenSize" |
| 17 android:hardwareAccelerated="true"> | |
| 18 <intent-filter> | 18 <intent-filter> |
| 19 <action android:name="android.intent.action.MAIN" /> | 19 <action android:name="android.intent.action.MAIN" /> |
| 20 <category android:name="android.intent.category.LAUNCHER" /> | 20 <category android:name="android.intent.category.LAUNCHER" /> |
| 21 </intent-filter> | 21 </intent-filter> |
| 22 </activity> | 22 </activity> |
| 23 <activity android:name="org.chromium.android_webview.test.AwTestRunnerActivi ty" | 23 <activity android:name="org.chromium.android_webview.test.AwTestRunnerActivi ty" |
| 24 android:label="AwTestRunnerActivity"> | 24 android:label="AwTestRunnerActivity"> |
| 25 <intent-filter> | 25 <intent-filter> |
| 26 <action android:name="android.intent.action.MAIN" /> | 26 <action android:name="android.intent.action.MAIN" /> |
| 27 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATIO N_TEST" /> | 27 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATIO N_TEST" /> |
| 28 </intent-filter> | 28 </intent-filter> |
| 29 </activity> | 29 </activity> |
| 30 <provider android:name="org.chromium.android_webview.test.TestContentProvide r" | 30 <provider android:name="org.chromium.android_webview.test.TestContentProvide r" |
| 31 android:authorities="org.chromium.android_webview.test.TestContentProvid er" /> | 31 android:authorities="org.chromium.android_webview.test.TestContentProvid er" /> |
| 32 </application> | 32 </application> |
| 33 | 33 |
| 34 <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. --> | 34 <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. --> |
| 35 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> | 35 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> |
| 36 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> | 36 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 37 <uses-permission android:name="android.permission.INTERNET"/> | 37 <uses-permission android:name="android.permission.INTERNET"/> |
| 38 <uses-permission android:name="android.permission.WAKE_LOCK"/> | 38 <uses-permission android:name="android.permission.WAKE_LOCK"/> |
| 39 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | 39 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
| 40 <uses-permission android:name="android.permission.RECORD_AUDIO" /> | 40 <uses-permission android:name="android.permission.RECORD_AUDIO" /> |
| 41 <uses-permission android:name="android.permission.RECORD_VIDEO" /> | 41 <uses-permission android:name="android.permission.RECORD_VIDEO" /> |
| 42 <uses-permission android:name="android.permission.CAMERA" /> | 42 <uses-permission android:name="android.permission.CAMERA" /> |
| 43 </manifest> | 43 </manifest> |
| OLD | NEW |