summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch ↵Elliott Hughes2014-07-101-1/+0
|\ | | | | | | | | | | | | frameworks/base/libs/androidfw to the new icu." * commit '583a845c6eb6308d7ada72cb0e91444efc91cc54': Switch frameworks/base/libs/androidfw to the new icu.
| * am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to ↵Elliott Hughes2014-07-101-1/+0
| |\ | | | | | | | | | | | | | | | | | | the new icu." * commit '3964ea46750cd5715f29ad4d9cada4a35208ad7a': Switch frameworks/base/libs/androidfw to the new icu.
| | * Switch frameworks/base/libs/androidfw to the new icu.Elliott Hughes2014-07-091-1/+0
| | | | | | | | | | | | Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
* | | Remove the unnessary logztenghui2014-07-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | We still need to investigate the underlying problem and fix it. bug:16015708 Change-Id: If38b550d5af990d5aaa6633ee129a61e927d66c1
* | | Merge "Fix layers lifecycle issues"John Reck2014-07-084-37/+69
|\ \ \
| * | | Fix layers lifecycle issuesJohn Reck2014-07-084-37/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16118540 Fix an issue where we could have a reference to a Layer after the GL context was destroyed Change-Id: I7bfd909d735ca6b942ebe188fc10099422eb6d95
* | | | SkBitmap::Config is deprecated, use SkColorTypeMike Reed2014-07-084-18/+18
|/ / / | | | | | | | | | Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996
* | | Revert "Fix destroyHardwareResources"John Reck2014-07-081-7/+2
| | | | | | | | | | | | | | | | | | This reverts commit bac48c4d0c6f71f67074a430cd365ea2e15924b8. Change-Id: Iba8b729d5e91ca31976fc2bdf9c1dd5fdb19de9a
* | | Merge "Query outline on background size change"Chris Craik2014-07-051-1/+1
|\ \ \
| * | | Query outline on background size changeChris Craik2014-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Background bounds are updated out of sync with View bounds, so query as they change. Change-Id: I9c94df17bac42dfcd4bb93b31903b59ebb58204b
* | | | Fix destroyHardwareResourcesJohn Reck2014-07-071-2/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | The UI thread needs to know whether or not the display list is valid, so bring back View.destroyHardwareResources and instead have the native side assert that View did the right thing Change-Id: I4f8dee6e9c13ec7ab520becdc5cfe20e92a76f8f
* | | Merge "kNative_8888_SkColorType is now kN32_SkColorType"Mike Reed2014-07-022-2/+2
|\ \ \
| * | | kNative_8888_SkColorType is now kN32_SkColorTypeMike Reed2014-07-072-2/+2
| | | | | | | | | | | | | | | | Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b
* | | | Add hack for custom re-rasterization bucketsChris Craik2014-07-079-39/+69
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:14083128 Moves all of the font transform management into OpenGLRenderer::findBestFontTransform(), and now simply passes down final rasterization transforms into the FontRenderer. Change-Id: Ie02752e6af863347b142367c7d628db5f9fc2998
* | | Add missing requireGlContextJohn Reck2014-07-071-0/+1
| | | | | | | | | | | | Change-Id: I7100e5e9986f502f66a23ecea07a6057522c43ac
* | | Fix VPA.cancel()John Reck2014-07-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15978905 Need to make sure we re-sync the UI properties on animator cancel, also don't animate for 1 frame after cancel() is called Change-Id: Ib660c0fb195b9f02bd795d03d43ea67bffebb499
* | | am 10eb3b06: am e0849423: am 501bb0a5: Merge "Fix issue when converting ↵Narayan Kamath2014-07-071-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | fil->tl." * commit '10eb3b0665dd7c636af5f0d657512c1a2e309e0c': Fix issue when converting fil->tl.
| * | am e0849423: am 501bb0a5: Merge "Fix issue when converting fil->tl."Narayan Kamath2014-07-071-2/+4
| |\ \ | | |/ | | | | | | | | | * commit 'e0849423214007d4377638fb42db15276e3ca575': Fix issue when converting fil->tl.
| | * Fix issue when converting fil->tl.Narayan Kamath2014-07-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should call ResourceTable::getLocales directly, and not AssetManager::getLocales. The latter will convert "tl" to "fil" so we'll end up thinking we have resources for "fil" when we don't really have any. bug: 15873165 Change-Id: I9753e4608aaecede328a40ee1f3ee6b016d0dedc
* | | resolved conflicts for merge of a8dbd7b4 to masterNick Kralevich2014-07-021-1/+56
|\ \ \ | |/ / | | | | | | Change-Id: I90f42546c6d0a8f21af3041e59baf6a226247b1c
| * | am 39e4f590: am f56399f6: Merge "Fall back to "tl" if "fil" is absent."Narayan Kamath2014-07-021-1/+56
| |\ \ | | |/ | | | | | | | | | * commit '39e4f590787246ce35b995c0c0ce37b676a05e0c': Fall back to "tl" if "fil" is absent.
| | * Fall back to "tl" if "fil" is absent.Narayan Kamath2014-07-021-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For JB-MR1, there was a hack that used "tl" where we really meant "fil" because ICU didn't have localizations for "fil". This has now been fixed, and we now support 3 letter language codes for AAPT so we can use "fil" where required. For the benefit of apps that need to target older platforms, we fall back to "tl" if the app has assets for "tl" and the resource locale is "fil". See bugs 7291355, 7207176 and 8049507 for more context. Change-Id: I1ac8502525f99b40f9091d5efd2df33518d47a41
| * | Fix klp-modular-dev-plus-aosp buildChris Craik2014-07-011-1/+1
| | | | | | | | | | | | Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
* | | Fixes to startDelayJohn Reck2014-07-013-22/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15991758 Don't update the UI thread with final value until after startDelay Change-Id: Ie8bffb5a3ace353ec1d82943a4efcbd01c42c28f
* | | Merge "Fix onTrimMemory for HardwareRenderer"John Reck2014-06-306-21/+76
|\ \ \
| * | | Fix onTrimMemory for HardwareRendererJohn Reck2014-06-306-21/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes detachFunctor possibly drawing after return Bug: 15189843 Bug: 15990672 Change-Id: I64c48cb674c461a8eeaba407b697e09f72c98ce3
* | | | am 8c1c0a68: am 7f319c47: am 1dc550fa: Merge "Fix packing of values at ↵Narayan Kamath2014-07-012-3/+27
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | offset 16." * commit '8c1c0a6881b1507f9ae25d753b64de185a7615b2': Fix packing of values at offset 16.
| * | | am 7f319c47: am 1dc550fa: Merge "Fix packing of values at offset 16."Narayan Kamath2014-07-012-3/+27
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '7f319c47c8f5e947638eb1e5e73789ff83123bba': Fix packing of values at offset 16.
| | * | Fix packing of values at offset 16.Narayan Kamath2014-06-302-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our bitmask for setting the highest bit to 0 for 0b11100000 (0xef) instead of 0b01111111 (0x7f) so we would end up setting bit 5 of each offset to zero. Fix this and expand test coverage by adding a fake language (tgp) that has this bit set in both its bytes. This issue was discovered while adding CTS tests for "tgl". Change-Id: Ibb6de03000951c907c252049771039ab7466187a
| * | | am b20b0629: am 71dfc7e9: Merge "Memory leak in parsePackage"Narayan Kamath2014-06-241-5/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b20b0629c2ea6a8e1f7bebd0791dd21e545a4605': Memory leak in parsePackage
| | * | Merge "Memory leak in parsePackage"Narayan Kamath2014-06-241-5/+15
| | |\ \
| | | * | Memory leak in parsePackageHenrik Baard2014-06-231-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method parsePackage failes to delete some resources in case of failures. Added delete of "package" in the cases that was previously missed. Change-Id: I183e9ec5864c5ed18bb48410ab41317cb3d96bda
| * | | | am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."Dan Albert2014-06-202-9/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a642a9ea3b2288b431ecb284b94a4657ae62889d': Use openssl's SHA1 instead of bionic's.
* | | | | Deep copy SkPath parameter to PathCache taskChris Craik2014-06-302-5/+8
| |_|_|/ |/| | | | | | | | | | | | | | | bug:15440706 Change-Id: I2b5b25f620df838cb1155cc8502d86ad3644c212
* | | | Merge "More cleanups"John Reck2014-06-274-0/+22
|\ \ \ \
| * | | | More cleanupsJohn Reck2014-06-274-0/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: Id5967944b949a2aec57e4fe9fdcdc04c11b8c35a
* | | | | Remove isRecording() method from renderersChris Craik2014-06-273-16/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | DisplayListRenderer is all that's accessed from java, and is entirely separate from OpenGLRenderer now. Change-Id: Ie733be71520c13fdb55dfe3522bb445ae2b50ac1
* | | | CleanupJohn Reck2014-06-272-8/+2
| | | | | | | | | | | | | | | | Change-Id: I8a75e6e32a4cb02e3978503305b4cdce1727e89a
* | | | Animator refactoring & fixesJohn Reck2014-06-2613-134/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweaks animators to have less unnecessary refcounting Pull animator management out into seperate class More control to tweak animator lifecycle, such as doing Java-side handling of start delay by attaching but not starting the animator Change-Id: I4ff8207580ca11fb38f45ef0007b406e0097281c
* | | | Merge "Fix contants; RT-enable WebView pt2"John Reck2014-06-232-4/+2
|\ \ \ \
| * | | | Fix contants; RT-enable WebView pt2John Reck2014-06-242-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15838537 * Fix kSync_UIRedrawRequired constant value (woops) * Tell CanvasContext that WebView is now rt-safe Change-Id: Idf15cf21115c2ca24b8ccd00025e8502864cd87c
* | | | | Cleanup unused includes in the hwui library.Derek Sollenberger2014-06-241-2/+0
|/ / / / | | | | | | | | | | | | Change-Id: I94c188403f5fa541e47a03a3bd1c7cf00c29bf4e
* | | | Merge "No-fail invokeFunctor"John Reck2014-06-2330-521/+776
|\ \ \ \
| * | | | No-fail invokeFunctorJohn Reck2014-06-2330-521/+776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15513308 Bug: 15449247 Change-Id: I13a29f9c8d4975cdda6dcb33b6332c2555ff0f7c
* | | | | Merge "Enable asynchronous RenderThread for WebView"Bo Liu2014-06-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable asynchronous RenderThread for WebViewBo Liu2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 12179257 Change-Id: Ib7358dc84a0a58020d178d10b324b9631848c06d
* | | | | Update 'DisplayList' vs 'RenderNode' naming in several placesChris Craik2014-06-2313-89/+83
|/ / / / | | | | | | | | | | | | Change-Id: I635c6627d098b661fb9b0ba1bd42fa6d7277d287
* | | | Merge "Wrap ViewGroup content in save/restore to protect composited children"Chris Craik2014-06-205-38/+55
|\ \ \ \
| * | | | Wrap ViewGroup content in save/restore to protect composited childrenChris Craik2014-06-205-38/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:15570351 Pos Z composited children are drawn before the primary restore for a RenderNode. This means that without an additional save/restore (which wraps the content) they aren't protected from transformations/clips that happen within the ViewGroup's DisplayList. Also changes RenderNode to use OpenGLRenderer tag for displaylist dumping consistency, and simplifies the entry points into RenderNode drawing, since the distinction between tree root vs tree internal is no longer important. Change-Id: I2621eba0592c74d71f85a91a4ab3d0da2d7468d3
* | | | | Merge "Re-enable ViewPropAnimRT"John Reck2014-06-203-0/+10
|\ \ \ \ \