summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge "New touch input support"John Reck2012-04-114-13/+30
|\
| * New touch input supportJohn Reck2012-04-114-13/+30
| | | | | | | | | | | | Bug: 6317798 Change-Id: Idea47af14e282b42c902c8158f08f6742ba576da
* | Merge "Fix crash."Mangesh Ghiware2012-04-111-21/+22
|\ \
| * | Fix crash.Mangesh Ghiware2012-04-111-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | Add null checks for m_baseLayer. Refactor common code to a separate getLayerTransform() function that returns a draw tranform ptr. Bug: 6239165 Change-Id: I7c2079e58b49c10a780b099fea9e3d7959b7fe00
* | | Merge "Unify composited layer/base layer draw path"Chris Craik2012-04-116-99/+6
|\ \ \
| * | | Unify composited layer/base layer draw pathChris Craik2012-04-106-99/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple paths were redundant, as they both synchronized the layers, and drew the base if needed. depends on frameworks/base change: https://android-git.corp.google.com/g/#/c/179964/ largely reverts 3adbe453816c9282bfe1d212e813661ce2590955 Change-Id: Ic60f79521dc62e7c2281302bc51a3dfde16d396f
* | | | Merge "Sort surface drawing order by Z value"Chris Craik2012-04-112-2/+19
|\ \ \ \
| * | | | Sort surface drawing order by Z valueChris Craik2012-04-112-2/+19
| |/ / / | | | | | | | | | | | | | | | | bug:6275189 Change-Id: Ib9cabadb77777244c6ef707c32ce53db3ebf3181
* | | | Merge "Treat image texture TileGrids as non-base surfaces"Chris Craik2012-04-112-11/+9
|\ \ \ \
| * | | | Treat image texture TileGrids as non-base surfacesChris Craik2012-04-102-11/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Was ignoring transform calculation bug:6317028 Change-Id: I9d5d491ef9eb853535e18a8ad10ab387d77e2d80
* | | | Merge "Removed unused bool"Chris Craik2012-04-112-8/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed unused boolChris Craik2012-04-102-8/+0
| |/ / | | | | | | | | | | | | bug:5636249 Change-Id: Ic99ab5a386009fcfb52ceaffc4881fe2f1d8d627
* | | Merge "Revert "Revert "Keep selection handles in edit fields."""George Mount2012-04-103-28/+35
|\ \ \
| * | | Revert "Revert "Keep selection handles in edit fields.""George Mount2012-04-103-28/+35
| | | | | | | | | | | | This reverts commit eb4152454774fa6e38c8be1a2810bc893d494de3
* | | | Merge "Expand base layer bounds to fill viewport"Chris Craik2012-04-103-1/+17
|\ \ \ \
| * | | | Expand base layer bounds to fill viewportChris Craik2012-04-103-1/+17
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, paint area outside the content bounds with content bg color in software rendering path. bug:6304213 Change-Id: I6fe5246e82d30fe000e570c8dccb605d46fc428d
* | | | Merge "Revert "Keep selection handles in edit fields.""George Mount2012-04-103-35/+28
|\ \ \ \ | | |/ / | |/| |
| * | | Revert "Keep selection handles in edit fields."George Mount2012-04-103-35/+28
| | | | | | | | | | | | This reverts commit 76a09fb547aa97b2f0e9cbb1e4a800d61b30a477
* | | | Merge "Turn on Fence sync for transfer queue."Teng-Hui Zhu2012-04-101-1/+1
|\ \ \ \
| * | | | Turn on Fence sync for transfer queue.Teng-Hui Zhu2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given driver bug b/6222131 is fixed, we can turn on this sync to protect us from potential corruption and help the emulation. Change-Id: Icc6c2d8fc3d123cde972507c3261729cd912676d
* | | | | Merge "Keep selection handles in edit fields."George Mount2012-04-103-28/+35
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Keep selection handles in edit fields.George Mount2012-04-103-28/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6264769 Framework Change: I9ee89f8b1d4e6954092b8c4d677fb75b79354b36 Change-Id: Ie937a8c55da0f8aef66cfcee11beb961669b7168
* | | | | Merge "Revert "Add webkit plumbing for file origin policy""Selim Gurun2012-04-091-15/+0
|\ \ \ \ \
| * | | | | Revert "Add webkit plumbing for file origin policy"Selim Gurun2012-04-091-15/+0
| | | | | | | | | | | | | | | | | | This reverts commit 960271d799b3ee4b8de483109435a9092d99c468
* | | | | | Merge "Add webkit plumbing for file origin policy"Selim Gurun2012-04-091-0/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add webkit plumbing for file origin policySelim Gurun2012-03-301-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6212665 Change-Id: I7d9b0d26f26c9f9bdaa7febd8739358d300f3476
* | | | | | Merge "Don't render expanded bounds if useMinimalMemory set"Chris Craik2012-04-092-8/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don't render expanded bounds if useMinimalMemory setChris Craik2012-04-092-8/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Extracted TilesManager instance locally, and standardized the extraction naming. Change-Id: Ia6ba1013bc6502f7c3a49d5dbf5d74739d997d2e
* | | | | Force kModeProcess functor invocation to returnChris Craik2012-04-091-1/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously drawing would cease if no painting collection existed, regardless of whether the drawing collection was ready. This change forces drawing to occur once the functor enters kModeProcess, since it should only arrive there by content missing. Change-Id: I6c14ad4180499dda0461c6c45d46f22c5690f61b
* | | | Merge "disable expanded bounds when highEndGfx=false"Chris Craik2012-04-091-2/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | disable expanded bounds when highEndGfx=falseChris Craik2012-04-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also make prefetch bounds only additionally expand in the Y direction bug:6273774 bug:6299994 Change-Id: I65d981a9e01adb605deff403c338deebcbf5e8ec
* | | | Merge "reduce JNI usage for findAll()/findNext()"Victoria Lease2012-04-092-26/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | reduce JNI usage for findAll()/findNext()Victoria Lease2012-04-042-26/+8
| | | | | | | | | | | | | | | | | | | | Bug: 6052412 Change-Id: I76b27408223212090558fa3e7a2c878a97549c2c
* | | | Temporary workaround to fix a bug on google.comNicolas Roard2012-04-061-1/+3
| |/ / |/| | | | | | | | Change-Id: Ie03798396ed7df6fea6cb2ae7e1f7ae327409139
* | | Reorganize platform/graphics/androidNicolas Roard2012-04-06105-52/+56
| | | | | | | | | | | | Change-Id: Idc67155cfa99784dcd931e705336bfa063ecae46
* | | Merge "Implements a recording GraphicsContext"Nicolas Roard2012-04-0625-1215/+2961
|\ \ \
| * | | Implements a recording GraphicsContextNicolas Roard2012-04-0625-1215/+2961
| | | | | | | | | | | | | | | | Change-Id: I41feadb23dce25af321331c459eb159c6141831b
* | | | TransferQueue: use BufferQueue::setBufferCountJamie Gennis2012-04-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change switches the TransferQueue to use the BufferQueue::setBufferCount method rather than the SurfaceTexture method. The SurfaceTexture method has been removed as part of the SurfaceTexture refactoring. Change-Id: I906b710b426d91181d73be18fc0aeefd514d3c91
* | | | Merge "Merging drawLayerQuad and drawQuad"Teng-Hui Zhu2012-04-0515-151/+324
|\ \ \ \
| * | | | Merging drawLayerQuad and drawQuadTeng-Hui Zhu2012-04-0515-151/+324
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the draw interface, organize the data for draw in a better way. Add a forceBlending from Tile to make sure translucent background can force blending too. Change-Id: I3baa16cbdd8fda6fb4ab4087b74a1e0c9aa1e81b
* | | | Merge "minor cleanup"Chris Craik2012-04-056-25/+7
|\ \ \ \
| * | | | minor cleanupChris Craik2012-04-056-25/+7
| |/ / / | | | | | | | | | | | | Change-Id: Ib873df1bb3e7a76a5a34acc89e4deff217e698e0
* | | | Merge "Avoid leaking a JNI local ref in JavaInputStreamWrapper::read()"Steve Block2012-04-051-36/+28
|\ \ \ \
| * | | | Avoid leaking a JNI local ref in JavaInputStreamWrapper::read()Steve Block2012-04-051-36/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we release the local ref returned by NewByteArray() once we've taken a global ref to the array. Also fix up the rest of the file to use ScopedLocalRef to avoid this kind of problem in future. Bug: 5498704 Change-Id: I33754a0188a3c08a5c34d0e161cd7073f83070c6
* | | | | Cleanup unnecessary codeTeng-Hui Zhu2012-04-041-5/+0
| |/ / / |/| | | | | | | | | | | Change-Id: I420b9fc5793c0df923229443dd2863e2d36612b6
* | | | Merge "Rename several classes"Chris Craik2012-04-0452-607/+731
|\ \ \ \
| * | | | Rename several classesChris Craik2012-04-0452-607/+731
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BaseTile,BaseTileTexture -> Tile,TileTexture Used in layers other than the base LayerGroup -> Surface Renamed to convey that it is a member of the SurfaceCollection, and that the layers grouped inside are painted together (if at all) DualTiledTexture -> SurfaceBacking Better conveys that this is the raster backing for a surface that can paint. It may be implemented with two tiled textures for now, but that isn't as important as its relationship to the surface. TiledTexture -> TileGrid Renamed to make it more clear that it was a container of tiles, and to be less similar to TileTexture Change-Id: I843f8603a2080cfe5a7313ba1c2eff10620f8aa2
* | | | | Oops! Double negative in previous change.Amith Yamasani2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I948679e429018550e8b7fb867a8c24edc61b443f
* | | | | Merge "Small change in a structure used for storing nine patch info."Amith Yamasani2012-04-041-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Small change in a structure used for storing nine patch info.Amith Yamasani2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6087201 Change-Id: I2ff23f7b6f8ba13f8e5593d81d2576ef60c5930d