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

Side by Side Diff: android_webview/test/shell/AndroidManifest.xml

Issue 524933002: Revert of android: Use hw acceleration in android_webview_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
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" android:hardwareAccelerated="false">
14 <activity android:name="org.chromium.android_webview.shell.AwShellActivity" 14 <activity android:name="org.chromium.android_webview.shell.AwShellActivity"
15 android:label="Android WebView Test Shell" 15 android:label="Android WebView Test Shell"
16 android:configChanges="orientation|keyboardHidden|keyboard|screenSize" 16 android:configChanges="orientation|keyboardHidden|keyboard|screenSize">
17 android:hardwareAccelerated="true">
18 <intent-filter> 17 <intent-filter>
19 <action android:name="android.intent.action.MAIN" /> 18 <action android:name="android.intent.action.MAIN" />
20 <category android:name="android.intent.category.LAUNCHER" /> 19 <category android:name="android.intent.category.LAUNCHER" />
21 </intent-filter> 20 </intent-filter>
22 </activity> 21 </activity>
23 <activity android:name="org.chromium.android_webview.test.AwTestRunnerActivi ty" 22 <activity android:name="org.chromium.android_webview.test.AwTestRunnerActivi ty"
24 android:label="AwTestRunnerActivity" 23 android:label="AwTestRunnerActivity">
25 android:hardwareAccelerated="false">
26 <intent-filter> 24 <intent-filter>
27 <action android:name="android.intent.action.MAIN" /> 25 <action android:name="android.intent.action.MAIN" />
28 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATIO N_TEST" /> 26 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATIO N_TEST" />
29 </intent-filter> 27 </intent-filter>
30 </activity> 28 </activity>
31 <provider android:name="org.chromium.android_webview.test.TestContentProvide r" 29 <provider android:name="org.chromium.android_webview.test.TestContentProvide r"
32 android:authorities="org.chromium.android_webview.test.TestContentProvid er" /> 30 android:authorities="org.chromium.android_webview.test.TestContentProvid er" />
33 </application> 31 </application>
34 32
35 <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. --> 33 <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. -->
36 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> 34 <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
37 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> 35 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
38 <uses-permission android:name="android.permission.INTERNET"/> 36 <uses-permission android:name="android.permission.INTERNET"/>
39 <uses-permission android:name="android.permission.WAKE_LOCK"/> 37 <uses-permission android:name="android.permission.WAKE_LOCK"/>
40 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> 38 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
41 <uses-permission android:name="android.permission.RECORD_AUDIO" /> 39 <uses-permission android:name="android.permission.RECORD_AUDIO" />
42 <uses-permission android:name="android.permission.RECORD_VIDEO" /> 40 <uses-permission android:name="android.permission.RECORD_VIDEO" />
43 <uses-permission android:name="android.permission.CAMERA" /> 41 <uses-permission android:name="android.permission.CAMERA" />
44 </manifest> 42 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698