summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add AnimationDrawable testztenghui2014-06-033-13/+101
| | | | Change-Id: Ieabd1f628cdccd4939f733f92c0cbefbf8bc0446
* Merge "Handle the alpha in the group setting and fix the fill issue."ztenghui2014-06-0311-3/+108
|\
| * Handle the alpha in the group setting and fix the fill issue.ztenghui2014-06-0311-3/+108
| | | | | | | | | | | | | | | | | | | | The fill used to be dafault as "none". Now it is default to opaque black, which is consistent with svg now. So it is better to always set the fill value. bug:15288554 Change-Id: I07ac41c5adc77665e66e52f2c0220139586fb09b
* | Merge "Add the tree hierarchy for the group"ztenghui2014-06-034-2/+163
|\ \ | |/
| * Add the tree hierarchy for the groupztenghui2014-06-024-2/+163
| | | | | | | | | | | | bug:15288554 Change-Id: I7caedb8466d078a0d9a6148e00d02eded4a4d234
* | fix buildJohn Reck2014-06-031-1/+0
| | | | | | | | Change-Id: I7fbe80ab0fbbc857c5785034a3c4129bccdec41c
* | am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-devJohn Reck2014-06-021-6/+12
|\ \ | | | | | | | | | | | | * commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a': Add setStartValue to RNA
| * \ Merge "Add setStartValue to RNA" into lmp-preview-devJohn Reck2014-06-021-6/+12
| |\ \
| | * | Add setStartValue to RNAJohn Reck2014-06-021-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15198607 Should be good-enough for Ripples to use for pseudo-chaining support. Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
* | | | am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" ↵RoboErik2014-06-021-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-preview-dev * commit 'c7ed6f69d474f23df89d36ed94ff0062daa8dcbc': Minimum work to make volume handling work with sessions
| * | | Merge "Minimum work to make volume handling work with sessions" into ↵RoboErik2014-06-021-2/+2
| |\ \ \ | | |/ / | |/| | | | | | lmp-preview-dev
| | * | Minimum work to make volume handling work with sessionsRoboErik2014-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the minimum change to make adjusting volume work with MediaSessions. This only affects adjusting the volume and adjusting the volume with a suggested stream. Adjusting a specific stream or setting a specific stream will still use the same code. This does not fix existing remote volume handling in RCC, which will require a separate change to MediaController. Change-Id: I5b957ff4bece1ee11e2364e1f216e1c08343c983
* | | | am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-devDianne Hackborn2014-05-315-36/+130
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd6f7d9b75931d031086a744cfd18994b2673f311': Clean up voice API.
| * | | Merge "Clean up voice API." into lmp-preview-devDianne Hackborn2014-05-305-36/+130
| |\ \ \ | | |/ / | |/| |
| | * | Clean up voice API.Dianne Hackborn2014-05-305-36/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add various java docs. Switch to CharSequence where appropriate. Add new request for canceling voice interaction. Also update test app to follow API changes and be more better. Change-Id: If27eeba53cf6444660adb7d37ea2ce0557c6c91f
* | | | am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-devRoboErik2014-05-305-54/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * commit '80ec18a90a1ce3d1b68deba8bcf81abcca04e520': Refactor transport controls APIs API changes to sessions
| * | | Merge changes I16ad392e,Ie26a7d01 into lmp-preview-devRoboErik2014-05-305-54/+44
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | * changes: Refactor transport controls APIs API changes to sessions
| | * | Refactor transport controls APIsRoboErik2014-05-302-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges TransportPerformer into MediaSession + a TransportControlsCallback and makes TransportController into an inner class on MediaController called TransportControls. Also makes the PlaybackState and Metadata part of the session APIs instead of transport controls. Change-Id: I16ad392e6d318abe3119ad5d89656d253af25e16
| | * | API changes to sessionsRoboErik2014-05-294-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes requested by API Council review. A second CL will refactor TransportController and TransportPerformer based on feedback. Change-Id: Ie26a7d01d7021232a66c2edf1eb58120437fdfde
* | | | am f6550f0a: Merge "More work on voice interaction visuals." into ↵Dianne Hackborn2014-05-302-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-preview-dev * commit 'f6550f0ab2fb1abae6f9d694c87ccba9bede57f4': More work on voice interaction visuals.
| * | | More work on voice interaction visuals.Dianne Hackborn2014-05-302-1/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a special theme for voice interaction activities to use, so they can be a panel that is better intergrated with the rest of the voice interaction experience. This is still not completely working, I have some hacks in the demo app to get it right; I'll fix that in a future change. Also improve VoiceInteractor to be retained across activity instances, for things like rotation. And bump up the number of concurrent broadcasts that are allowed on non-svelte devices, since they can handle more and this makes the boot experience better when dispatching BOOT_COMPLETED. Change-Id: Ie86b5fd09b928da20d645ec2200577dee3e6889d
* | | Markup support for frameworkNiels Egberts2014-05-306-0/+1246
| | | | | | | | | | | | Change-Id: Ia5ad6cff7593c295944a90775a1b061c95f5cc3f
* | | am c2091a1f: Merge "Add system layer for voice interaction services." into ↵Dianne Hackborn2014-05-293-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-preview-dev * commit 'c2091a1fbc463941b3e42db36e369124ac3c1013': Add system layer for voice interaction services.
| * | Merge "Add system layer for voice interaction services." into lmp-preview-devDianne Hackborn2014-05-293-2/+4
| |\ \
| | * | Add system layer for voice interaction services.Dianne Hackborn2014-05-283-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New window layer that voice interaction service windows go in to. Includes a new voice-specific content rectangle that voice activities are placed in to. Add specific animations for this layer, sliding down from the top (though this can be customized by the voice interaction service). Also add the concept of activities running for voice interaction services for purposes of adjusting the animation used for them, again sliding from the top, but not (yet?) customizable by the voice interaction service. Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
* | | | am 9ecf9b12: Merge "Respect Z ordering in touch dispatch, software drawing" ↵Chris Craik2014-05-294-11/+68
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-preview-dev * commit '9ecf9b1292d547aebe4588f1051b22f9683e2149': Respect Z ordering in touch dispatch, software drawing
| * | | Merge "Respect Z ordering in touch dispatch, software drawing" into ↵Chris Craik2014-05-284-11/+68
| |\ \ \ | | |/ / | |/| | | | | | lmp-preview-dev
| | * | Respect Z ordering in touch dispatch, software drawingChris Craik2014-05-284-11/+68
| | | | | | | | | | | | | | | | | | | | bug:14390526 Change-Id: I617a6ea7dbac1facae246491a247cf307452fc0e
* | | | Merge "Add translation and scale to the group tag and related tests."ztenghui2014-05-284-4/+72
|\ \ \ \ | | |_|/ | |/| |
| * | | Add translation and scale to the group tag and related tests.ztenghui2014-05-284-4/+72
| | | | | | | | | | | | | | | | | | | | | | | | bug:15288554 Change-Id: Iebe176d0a9c2c566d1910674a068e65e15569829
* | | | Merge "Move the rotation information from path to group."ztenghui2014-05-2811-82/+73
|\ \ \ \ | |/ / /
| * | | Move the rotation information from path to group.ztenghui2014-05-2811-82/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the 3rd test to correctly testing clipping. Removing some naive tests which rotate 360 or 0. bug:15288554 Change-Id: I436e8e494cb78fc665a3890171a1af87367db419
* | | | am dc0230fc: Merge "camera2: Add partial results to the capture listener ↵Igor Murashkin2014-05-271-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | (API change)" into lmp-preview-dev * commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4': camera2: Add partial results to the capture listener (API change)
| * | camera2: Add partial results to the capture listener (API change)Igor Murashkin2014-05-271-1/+2
| |/ | | | | | | | | | | | | * Also adds capture sequence aborted callback Bug: 12492876 Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
| * DO NOT MERGE Inspect SkShader to determine hw shader.Leon Scroggins III2014-05-232-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick of Iaa7189178bda1c55f96da044d2a9fa602ba36034 Instead of duplicating internal info about SkShader, inspect the SkShader installed on the SkPaint. core/java/android/view/GLES20Canvas.java: Remove setupModifiers, nResetModifiers, and nSetupShader. core/jni/android/graphics/Shader.cpp: Remove calls to create/destroy the (previously) attached SkiaShader. core/jni/android_view_GLES20Canvas.cpp: Remove native code for setupShader and resetModifiers. graphics/java/android/graphics/BitmapShader.java: graphics/java/android/graphics/ComposeShader.java: graphics/java/android/graphics/LinearGradient.java: graphics/java/android/graphics/RadialGradient.java: graphics/java/android/graphics/Shader.java: graphics/java/android/graphics/SweepGradient.java: Remove code keeping track of native SkiaShader. libs/hwui/Caches.h: Include Extensions.h. libs/hwui/DeferredDisplayList.cpp: Compare shaders on the paint, instead of on DrawModifiers. libs/hwui/DisplayList.cpp: libs/hwui/DisplayList.h: Remove vector of SkiaShaders. libs/hwui/DisplayListOp.h: Access the SkShader on mPaint. Remove SetupShaderOp and ResetShaderOp. libs/hwui/DisplayListRenderer.cpp: libs/hwui/DisplayListRenderer.h: Remove resetShader, setupShader, refShader, and mShaderMap. libs/hwui/FontRenderer.cpp: Pass SkShader to setupDrawShader and setupDrawShaderUniforms. libs/hwui/OpenGLRenderer.cpp: libs/hwui/OpenGLRenderer.h: Add LayerShader, a class inheriting from SkShader, to mimic the behavior of SkiaLayerShader. Unlike SkiaLayerShader, it can be set on the SkPaint so it can be inspected later. Set a LayerShader instead of a SkiaLayerShader. setupDrawShader and setupDrawShaderUniforms now inspect an SkShader passed in. Inspect SkShader instead of mDrawModifiers.mShader. Remove resetShader and setupShader. setupDrawColorUniforms now takes a boolean indicating whether there is a shader. Add an inline function for accessing the SkShader on an SkPaint. In setupDrawBlending(Layer*, bool), do not check the shader (which will never be set), but do check whether the color filter may change the alpha (newly fixed behavior). In setupDrawBlending(SkPaint, ...), check the SkShader and whether the color filter affects alpha (the latter is new behavior). libs/hwui/Renderer.h: Remove pure virtual functions setupShader and resetShader. libs/hwui/ResourceCache.cpp: libs/hwui/ResourceCache.h: Remove functions for refing/unrefing shaders. libs/hwui/SkiaShader.cpp: libs/hwui/SkiaShader.h: Much of this code was redundant and has been removed. Convert structs into class with nothing but static functions for calling describe/setupProgram. libs/hwui/TextureCache.cpp: libs/hwui/TextureCache.h: Use the SkPixelRef as the key to the bitmap Lru cache, since shader inspection will provide a different SkBitmap pointer (though it will hold the correct SkPixelRef with the correct generation ID). tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java: tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java: Update manual test to have more shaders: radial, sweep, compose, invalid compose. BUG:10650594 Change-Id: I2e7182b3fc28268e7ca82fac6780540b6b45365c
* | Bring the group tag back to VectorDrawable.ztenghui2014-05-2728-337/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step, including: 1. Bring the group tag back by reverting. 2. If there is no group tag, then treat all the paths as a single group. Make sure our test cases covering both cases. At the same time, fix one tiny UI bug in the test. TODO: 1. Move the rotation to the group tag. 2. Add translation/scale to the group tag. 3. Convert the group into a tree hierarchy. This reverts commit 404211630ba3bb865109434aba4433e7541b39d3. Conflicts: graphics/java/android/graphics/drawable/VectorDrawable.java Change-Id: Ife65bb6a7fc85f9947124b8e356cd5b82119796a
* | Merge "Inspect SkShader to determine hw shader."Chris Craik2014-05-232-0/+55
|\ \ | |/ |/|
| * Inspect SkShader to determine hw shader.Leon Scroggins III2014-05-222-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of duplicating internal info about SkShader, inspect the SkShader installed on the SkPaint. core/java/android/view/GLES20Canvas.java: Remove setupModifiers, nResetModifiers, and nSetupShader. core/jni/android/graphics/Shader.cpp: Remove calls to create/destroy the (previously) attached SkiaShader. core/jni/android_view_GLES20Canvas.cpp: Remove native code for setupShader and resetModifiers. graphics/java/android/graphics/BitmapShader.java: graphics/java/android/graphics/ComposeShader.java: graphics/java/android/graphics/LinearGradient.java: graphics/java/android/graphics/RadialGradient.java: graphics/java/android/graphics/Shader.java: graphics/java/android/graphics/SweepGradient.java: Remove code keeping track of native SkiaShader. libs/hwui/Caches.h: Include Extensions.h. libs/hwui/DeferredDisplayList.cpp: Compare shaders on the paint, instead of on DrawModifiers. libs/hwui/DisplayList.cpp: libs/hwui/DisplayList.h: Remove vector of SkiaShaders. libs/hwui/DisplayListOp.h: Access the SkShader on mPaint. Remove SetupShaderOp and ResetShaderOp. libs/hwui/DisplayListRenderer.cpp: libs/hwui/DisplayListRenderer.h: Remove resetShader, setupShader, refShader, and mShaderMap. libs/hwui/FontRenderer.cpp: Pass SkShader to setupDrawShader and setupDrawShaderUniforms. libs/hwui/OpenGLRenderer.cpp: libs/hwui/OpenGLRenderer.h: Add LayerShader, a class inheriting from SkShader, to mimic the behavior of SkiaLayerShader. Unlike SkiaLayerShader, it can be set on the SkPaint so it can be inspected later. Set a LayerShader instead of a SkiaLayerShader. setupDrawShader and setupDrawShaderUniforms now inspect an SkShader passed in. Inspect SkShader instead of mDrawModifiers.mShader. Remove resetShader and setupShader. setupDrawColorUniforms now takes a boolean indicating whether there is a shader. Add an inline function for accessing the SkShader on an SkPaint. In setupDrawBlending(Layer*, bool), do not check the shader (which will never be set), but do check whether the color filter may change the alpha (newly fixed behavior). In setupDrawBlending(SkPaint, ...), check the SkShader and whether the color filter affects alpha (the latter is new behavior). libs/hwui/Renderer.h: Remove pure virtual functions setupShader and resetShader. libs/hwui/ResourceCache.cpp: libs/hwui/ResourceCache.h: Remove functions for refing/unrefing shaders. libs/hwui/SkiaShader.cpp: libs/hwui/SkiaShader.h: Much of this code was redundant and has been removed. Convert structs into class with nothing but static functions for calling describe/setupProgram. libs/hwui/TextureCache.cpp: libs/hwui/TextureCache.h: Use the SkPixelRef as the key to the bitmap Lru cache, since shader inspection will provide a different SkBitmap pointer (though it will hold the correct SkPixelRef with the correct generation ID). tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java: tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java: Update manual test to have more shaders: radial, sweep, compose, invalid compose. BUG:10650594 Change-Id: Iaa7189178bda1c55f96da044d2a9fa602ba36034
* | Merge "Baby steps"John Reck2014-05-202-5/+1
|\ \
| * | Baby stepsJohn Reck2014-05-192-5/+1
| | | | | | | | | | | | | | | | | | Run ViewPropertyAnimators with no listeners on the RenderThread Change-Id: I7ff5300db96c7f4b59b09e3fff8a0df173f132dd
* | | Merge "Cleaned up CanvasCompare tests."Chris Craik2014-05-192-19/+13
|\ \ \
| * | | Cleaned up CanvasCompare tests.Antonio Calabrese2014-05-192-19/+13
| | |/ | |/| | | | | | | Change-Id: I93b2f73283e3ab2b8679bf36f29c7bd6cb74c6bf
* | | Merge "Rename session classes to have media prefix, hide routes"RoboErik2014-05-196-24/+24
|\ \ \ | |_|/ |/| |
| * | Rename session classes to have media prefix, hide routesRoboErik2014-05-166-24/+24
| | | | | | | | | | | | | | | | | | | | | This renames several of the core session classes to be prefixed with Media. It also adds @hide to all route references for now. Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
* | | Fix buildJi-Hwan Lee2014-05-172-4/+4
| | | | | | | | | | | | Change-Id: If0e46d6fa0f5b176c3b5294eab58d25935b3b4f8
* | | Fix buildChris Craik2014-05-161-1/+2
|/ / | | | | | | Change-Id: Ic0b36cd0f6525c4bc1ad365cd089e9a9fac9dc17
* | Merge "Round rect outline clipping"Chris Craik2014-05-162-0/+96
|\ \
| * | Round rect outline clippingChris Craik2014-05-152-0/+96
| |/ | | | | | | Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
* | Animator start value...John Reck2014-05-152-6/+14
|/ | | | Change-Id: Ifd35ed95a28c625086d7fa97764fe63ab4a997f1
* Merge "Remove the group tag."ztenghui2014-05-1227-364/+322
|\