diff options
| author | Chris Craik <ccraik@google.com> | 2015-05-28 22:03:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 22:03:08 +0000 |
| commit | 1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff (patch) | |
| tree | 2ae1662b8d6a4ff711e6ce621e690e4f6204c0f1 /tests | |
| parent | 5cd795a9094eb02c983751ecabca6f24b0a01c58 (diff) | |
| parent | fca52b7583d1e5f5ff8ed06554875d2a30ef56fa (diff) | |
| download | frameworks_base-1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff.zip frameworks_base-1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff.tar.gz frameworks_base-1cd7e4c3d0216cfb9a8a685ca8cf6f0d740a9dff.tar.bz2 | |
Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/HwAccelerationTest/AndroidManifest.xml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml index 8531944..10cf5c1 100644 --- a/tests/HwAccelerationTest/AndroidManifest.xml +++ b/tests/HwAccelerationTest/AndroidManifest.xml @@ -24,11 +24,11 @@ <uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera.autofocus" /> - <uses-sdk android:minSdkVersion="11" /> - + <uses-sdk android:minSdkVersion="21" /> + <application android:label="HwUi" - android:hardwareAccelerated="true"> + android:theme="@android:style/Theme.Material.Light"> <activity android:name="HwTests" @@ -42,8 +42,7 @@ <activity android:name="PathOpsActivity" - android:label="Path/Ops" - android:theme="@android:style/Theme.Holo.Light"> + android:label="Path/Ops"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="com.android.test.hwui.TEST" /> @@ -52,8 +51,7 @@ <activity android:name="AssetsAtlasActivity" - android:label="Atlas/Framework" - android:theme="@android:style/Theme.Holo.Light"> + android:label="Atlas/Framework"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="com.android.test.hwui.TEST" /> @@ -62,8 +60,7 @@ <activity android:name="ScaledTextActivity" - android:label="Text/Scaled" - android:theme="@android:style/Theme.Holo.Light"> + android:label="Text/Scaled"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="com.android.test.hwui.TEST" /> @@ -72,8 +69,7 @@ <activity android:name="Rotate3dTextActivity" - android:label="Text/3D Rotation" - android:theme="@android:style/Theme.Holo.Light"> + android:label="Text/3D Rotation"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="com.android.test.hwui.TEST" /> |