diff options
| author | Jason Sams <jsams@google.com> | 2012-09-07 15:38:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-07 15:38:25 -0700 |
| commit | 3f7bbe8cd37aba1be1a80222270057d78a032b54 (patch) | |
| tree | 6c0ad05b6e1426c5f2d5706a0dbbc85bc8624576 /tests | |
| parent | 5fc626639aa7ff2aed224b58891149e19fb24b57 (diff) | |
| parent | 8fd5853c1c07c2fd3954b3c5e64702d70af31144 (diff) | |
| download | frameworks_base-3f7bbe8cd37aba1be1a80222270057d78a032b54.zip frameworks_base-3f7bbe8cd37aba1be1a80222270057d78a032b54.tar.gz frameworks_base-3f7bbe8cd37aba1be1a80222270057d78a032b54.tar.bz2 | |
Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png | bin | 611708 -> 0 bytes | |||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg | bin | 0 -> 1062402 bytes | |||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg | bin | 0 -> 199029 bytes | |||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java | 4 |
4 files changed, 2 insertions, 2 deletions
diff --git a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png Binary files differdeleted file mode 100644 index 856eeff..0000000 --- a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png +++ /dev/null diff --git a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg Binary files differnew file mode 100644 index 0000000..05d3ee2 --- /dev/null +++ b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg diff --git a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg Binary files differnew file mode 100644 index 0000000..5bce392 --- /dev/null +++ b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java index 001dea8..2e7c671 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java @@ -243,8 +243,8 @@ public class ImageProcessingActivity extends Activity super.onCreate(savedInstanceState); setContentView(R.layout.main); - mBitmapIn = loadBitmap(R.drawable.city); - mBitmapOut = loadBitmap(R.drawable.city); + mBitmapIn = loadBitmap(R.drawable.img1600x1067); + mBitmapOut = loadBitmap(R.drawable.img1600x1067); mSurfaceView = (SurfaceView) findViewById(R.id.surface); |
