diff options
Diffstat (limited to 'tests')
15 files changed, 387 insertions, 3 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java index 939c623..9f580a3 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java @@ -76,7 +76,13 @@ public class FileFilter { "fast/js/excessive-comma-usage.html", // Tests huge initializer list, causes OOM. "fast/js/regexp-charclass-crash.html", // RegExp is too large, causing OOM "fast/regex/test1.html", // Causes DumpRenderTree to hang with V8 - "fast/regex/slow.html" // Causes DumpRenderTree to hang with V8 + "fast/regex/slow.html", // Causes DumpRenderTree to hang with V8 + "ietestcenter/Javascript/15.4.4.15-3-14.html", // hangs the layout tests + // http://b/issue?id=2889595 + "ietestcenter/Javascript/15.4.4.15-3-29.html", // hangs the layout tests + // http://b/issue?id=2889596 + "ietestcenter/Javascript/15.4.4.15-3-8.html" // hangs the layout tests + // http://b/issue?id=2889598 }; static void fillIgnoreResultList() { diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index f4773b5..8c7254c 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -754,7 +754,7 @@ public class TestShellActivity extends Activity implements LayoutTestController private static class NewWindowWebView extends WebView { public NewWindowWebView(Context context, Map<String, Object> jsIfaces) { - super(context, null, 0, jsIfaces); + super(context, null, 0, jsIfaces, false); } } diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml index b615657..73994f7 100644 --- a/tests/HwAccelerationTest/AndroidManifest.xml +++ b/tests/HwAccelerationTest/AndroidManifest.xml @@ -142,6 +142,34 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - + + <activity + android:name="LinesActivity" + android:label="_Lines" + android:hardwareAccelerated="false"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + + <activity + android:name="PathsActivity" + android:label="_Paths"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + + <activity + android:name="Transform3dActivity" + android:label="_3d"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> </manifest> diff --git a/tests/HwAccelerationTest/src/com/google/android/test/hwui/LinesActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/LinesActivity.java new file mode 100644 index 0000000..c800d42 --- /dev/null +++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/LinesActivity.java @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.android.test.hwui; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.BitmapShader; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.os.Bundle; +import android.view.View; + +@SuppressWarnings({"UnusedDeclaration"}) +public class LinesActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + final LinesView view = new LinesView(this); + setContentView(view); + } + + static class LinesView extends View { + private final Bitmap mBitmap1; + private final Paint mSmallPaint; + private final Paint mMediumPaint; + private final Paint mLargePaint; + private final BitmapShader mShader; + private final float[] mPoints; + private final Paint mAlphaPaint; + + LinesView(Context c) { + super(c); + + mBitmap1 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset1); + + mSmallPaint = new Paint(); + mSmallPaint.setAntiAlias(true); + mSmallPaint.setColor(0xffff0000); + mSmallPaint.setStrokeWidth(1.0f); + + mMediumPaint = new Paint(); + mMediumPaint.setAntiAlias(true); + mMediumPaint.setColor(0xff0000ff); + mMediumPaint.setStrokeWidth(4.0f); + + mLargePaint = new Paint(); + mLargePaint.setAntiAlias(true); + mLargePaint.setColor(0xff00ff00); + mLargePaint.setStrokeWidth(15.0f); + + mAlphaPaint = new Paint(); + mAlphaPaint.setAntiAlias(true); + mAlphaPaint.setColor(0x7fff0050); + mAlphaPaint.setStrokeWidth(10.0f); + + mShader = new BitmapShader(mBitmap1, BitmapShader.TileMode.MIRROR, + BitmapShader.TileMode.MIRROR); + + mPoints = new float[] { + 62.0f, 0.0f, 302.0f, 400.0f, + 302.0f, 400.0f, 352.0f, 400.0f, + 352.0f, 400.0f, 352.0f, 500.0f + }; + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + canvas.drawARGB(255, 255, 255, 255); + + canvas.save(); + canvas.translate(100.0f, 20.0f); + + canvas.drawLine(0.0f, 0.0f, 40.0f, 400.0f, mSmallPaint); + canvas.drawLine(5.0f, 0.0f, 95.0f, 400.0f, mMediumPaint); + canvas.drawLine(22.0f, 0.0f, 162.0f, 400.0f, mLargePaint); + + mLargePaint.setShader(mShader); + canvas.drawLine(42.0f, 0.0f, 222.0f, 400.0f, mLargePaint); + mLargePaint.setShader(null); + + canvas.drawLines(mPoints, mAlphaPaint); + + canvas.translate(120.0f, 0.0f); + mAlphaPaint.setShader(mShader); + canvas.drawLines(mPoints, mAlphaPaint); + mAlphaPaint.setShader(null); + + canvas.restore(); + } + } +} diff --git a/tests/HwAccelerationTest/src/com/google/android/test/hwui/PathsActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/PathsActivity.java new file mode 100644 index 0000000..39d9942 --- /dev/null +++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/PathsActivity.java @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.android.test.hwui; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.BitmapShader; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Path; +import android.graphics.RectF; +import android.os.Bundle; +import android.view.View; + +@SuppressWarnings({"UnusedDeclaration"}) +public class PathsActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + final PathsView view = new PathsView(this); + setContentView(view); + } + + static class PathsView extends View { + private final Bitmap mBitmap1; + private final Paint mSmallPaint; + private final Paint mMediumPaint; + private final Paint mLargePaint; + private final BitmapShader mShader; + private final Path mPath; + private final RectF mPathBounds; + private final Paint mBoundsPaint; + private final Bitmap mBitmap; + private final float mOffset; + private final Paint mLinePaint; + + PathsView(Context c) { + super(c); + + mBitmap1 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset1); + + mSmallPaint = new Paint(); + mSmallPaint.setAntiAlias(true); + mSmallPaint.setColor(0xffff0000); + mSmallPaint.setStrokeWidth(1.0f); + mSmallPaint.setStyle(Paint.Style.STROKE); + + mLinePaint = new Paint(); + mLinePaint.setAntiAlias(true); + mLinePaint.setColor(0xffff00ff); + mLinePaint.setStrokeWidth(1.0f); + mLinePaint.setStyle(Paint.Style.STROKE); + + mMediumPaint = new Paint(); + mMediumPaint.setAntiAlias(true); + mMediumPaint.setColor(0xff0000ff); + mMediumPaint.setStrokeWidth(10.0f); + mMediumPaint.setStyle(Paint.Style.STROKE); + + mLargePaint = new Paint(); + mLargePaint.setAntiAlias(true); + mLargePaint.setColor(0xff00ff00); + mLargePaint.setStrokeWidth(15.0f); + mLargePaint.setStyle(Paint.Style.FILL); + + mShader = new BitmapShader(mBitmap1, BitmapShader.TileMode.MIRROR, + BitmapShader.TileMode.MIRROR); + + mPath = new Path(); + mPath.moveTo(0.0f, 0.0f); + mPath.cubicTo(0.0f, 0.0f, 100.0f, 150.0f, 100.0f, 200.0f); + mPath.cubicTo(100.0f, 200.0f, 50.0f, 300.0f, -80.0f, 200.0f); + mPath.cubicTo(-80.0f, 200.0f, 100.0f, 200.0f, 200.0f, 0.0f); + + mPathBounds = new RectF(); + mPath.computeBounds(mPathBounds, true); + + mBoundsPaint = new Paint(); + mBoundsPaint.setColor(0x4000ff00); + + mOffset = mMediumPaint.getStrokeWidth(); + final int width = (int) (mPathBounds.width() + mOffset * 3.0f + 0.5f); + final int height = (int) (mPathBounds.height() + mOffset * 3.0f + 0.5f); + mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ALPHA_8); + Canvas canvas = new Canvas(mBitmap); + canvas.translate(-mPathBounds.left + mOffset * 1.5f, -mPathBounds.top + mOffset * 1.5f); + canvas.drawPath(mPath, mMediumPaint); + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + canvas.drawARGB(255, 255, 255, 255); + + canvas.save(); + canvas.translate(200.0f, 60.0f); + canvas.drawPath(mPath, mSmallPaint); + + canvas.translate(350.0f, 0.0f); + canvas.drawPath(mPath, mMediumPaint); + + mLargePaint.setShader(mShader); + canvas.translate(350.0f, 0.0f); + canvas.drawPath(mPath, mLargePaint); + mLargePaint.setShader(null); + canvas.restore(); + + canvas.save(); + canvas.translate(200.0f, 360.0f); + canvas.drawPath(mPath, mSmallPaint); + canvas.drawRect(mPathBounds, mBoundsPaint); + + canvas.translate(350.0f, 0.0f); + canvas.drawBitmap(mBitmap, mPathBounds.left - mOffset * 1.5f, + mPathBounds.top - mOffset * 1.5f, null); + canvas.drawRect(mPathBounds, mBoundsPaint); + canvas.drawLine(0.0f, -360.0f, 0.0f, 500.0f, mLinePaint); + + mLargePaint.setShader(mShader); + canvas.translate(350.0f, 0.0f); + canvas.drawPath(mPath, mLargePaint); + canvas.drawRect(mPathBounds, mBoundsPaint); + mLargePaint.setShader(null); + canvas.restore(); + } + } +} diff --git a/tests/HwAccelerationTest/src/com/google/android/test/hwui/Transform3dActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/Transform3dActivity.java new file mode 100644 index 0000000..6134cde --- /dev/null +++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/Transform3dActivity.java @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.android.test.hwui; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Camera; +import android.graphics.Canvas; +import android.graphics.Matrix; +import android.os.Bundle; +import android.view.View; + +@SuppressWarnings({"UnusedDeclaration"}) +public class Transform3dActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + final Transform3dView view = new Transform3dView(this); + setContentView(view); + } + + static class Transform3dView extends View { + private final Bitmap mBitmap1; + private Camera mCamera; + private Matrix mMatrix; + + Transform3dView(Context c) { + super(c); + + mBitmap1 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset1); + mCamera = new Camera(); + mMatrix = new Matrix(); + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + canvas.drawARGB(255, 255, 255, 255); + + final float centerX = getWidth() / 2.0f - mBitmap1.getWidth() / 2.0f; + final float centerY = getHeight() / 2.0f - mBitmap1.getHeight() / 2.0f; + final Camera camera = mCamera; + + final Matrix matrix = mMatrix; + + rotate(centerX, centerY, camera, matrix, 32.0f); + drawBitmap(canvas, centerX, centerY, 0.0f, matrix); + + rotate(centerX, centerY, camera, matrix, 12.0f); + drawBitmap(canvas, centerX, centerY, -mBitmap1.getWidth(), matrix); + + rotate(centerX, centerY, camera, matrix, 52.0f); + drawBitmap(canvas, centerX, centerY, mBitmap1.getWidth(), matrix); + + rotate(centerX, centerY, camera, matrix, 122.0f); + drawBitmap(canvas, centerX, centerY, mBitmap1.getWidth() * 2.0f, matrix); + + } + + private void drawBitmap(Canvas canvas, float centerX, float centerY, float offset, + Matrix matrix) { + canvas.save(); + canvas.translate(offset, 0.0f); + canvas.concat(matrix); + canvas.drawBitmap(mBitmap1, centerX, centerY, null); + canvas.restore(); + } + + private void rotate(float centerX, float centerY, Camera camera, + Matrix matrix, float angle) { + camera.save(); + camera.rotateY(angle); + camera.getMatrix(matrix); + camera.restore(); + + matrix.preTranslate(-centerX, -centerY); + matrix.postTranslate(centerX, centerY); + } + } +} diff --git a/tests/StatusBar/res/drawable-hdpi/app_gmail.png b/tests/StatusBar/res/drawable-hdpi/app_gmail.png Binary files differindex 1423dd0..23d33e5 100644 --- a/tests/StatusBar/res/drawable-hdpi/app_gmail.png +++ b/tests/StatusBar/res/drawable-hdpi/app_gmail.png diff --git a/tests/StatusBar/res/drawable-hdpi/app_phone.png b/tests/StatusBar/res/drawable-hdpi/app_phone.png Binary files differindex 4b7c5cb..772e7d3 100644 --- a/tests/StatusBar/res/drawable-hdpi/app_phone.png +++ b/tests/StatusBar/res/drawable-hdpi/app_phone.png diff --git a/tests/StatusBar/res/drawable-hdpi/ic_statusbar_chat.png b/tests/StatusBar/res/drawable-hdpi/ic_statusbar_chat.png Binary files differindex 7258ea2..e3b4e2b 100644 --- a/tests/StatusBar/res/drawable-hdpi/ic_statusbar_chat.png +++ b/tests/StatusBar/res/drawable-hdpi/ic_statusbar_chat.png diff --git a/tests/StatusBar/res/drawable-hdpi/ic_statusbar_email.png b/tests/StatusBar/res/drawable-hdpi/ic_statusbar_email.png Binary files differindex 8ea4816..8cefd36 100644 --- a/tests/StatusBar/res/drawable-hdpi/ic_statusbar_email.png +++ b/tests/StatusBar/res/drawable-hdpi/ic_statusbar_email.png diff --git a/tests/StatusBar/res/drawable-hdpi/ic_statusbar_missedcall.png b/tests/StatusBar/res/drawable-hdpi/ic_statusbar_missedcall.png Binary files differindex cb239c6..4feec28 100644 --- a/tests/StatusBar/res/drawable-hdpi/ic_statusbar_missedcall.png +++ b/tests/StatusBar/res/drawable-hdpi/ic_statusbar_missedcall.png diff --git a/tests/StatusBar/res/drawable-hdpi/icon1.png b/tests/StatusBar/res/drawable-hdpi/icon1.png Binary files differindex d6824c7..0485257 100644 --- a/tests/StatusBar/res/drawable-hdpi/icon1.png +++ b/tests/StatusBar/res/drawable-hdpi/icon1.png diff --git a/tests/StatusBar/res/drawable-hdpi/icon2.png b/tests/StatusBar/res/drawable-hdpi/icon2.png Binary files differindex 755bdf1..a630986 100644 --- a/tests/StatusBar/res/drawable-hdpi/icon2.png +++ b/tests/StatusBar/res/drawable-hdpi/icon2.png diff --git a/tests/StatusBar/res/drawable-hdpi/icon3.png b/tests/StatusBar/res/drawable-hdpi/icon3.png Binary files differindex b28bbb8..9d72b66 100644 --- a/tests/StatusBar/res/drawable-hdpi/icon3.png +++ b/tests/StatusBar/res/drawable-hdpi/icon3.png diff --git a/tests/StatusBar/res/drawable-hdpi/icon4.png b/tests/StatusBar/res/drawable-hdpi/icon4.png Binary files differindex 30a5b39..a4a40f2 100644 --- a/tests/StatusBar/res/drawable-hdpi/icon4.png +++ b/tests/StatusBar/res/drawable-hdpi/icon4.png |
