summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Remove unused ANDROID_STYLE_VERSION"George Mount2012-06-214-33/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused ANDROID_STYLE_VERSIONGeorge Mount2012-06-204-33/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ANDROID_STYLE_VERSION was introduced to help with performance of NavCache. Since removal of NavCache, this is unnecessary. Change-Id: I8ebb4f4830f855961ca9c9cdb0ef300d057091de
* | | | | | | | | Merge "Use Elegant fonts for Webkit, Compact fonts for Textview"Victoria Lease2012-06-211-62/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Use Elegant fonts for Webkit, Compact fonts for TextviewBilly Hewlett2012-06-181-62/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts can be marked with elegant or compact in fallback_fonts.xml. Webkit uses elegant fonts, Textview uses compact fonts (the default), unmarked fonts are used by both. Bug: 6649136 Change-Id: Ib131a4279fb3c13a44ff37d45b2b736274fa5042
* | | | | | | | am 50034a4c: am 903d2ec9: Merge "Don\'t use deleted Node object in ↵Jean-Baptiste Queru2012-06-201-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setSizeScreenWidthAndScale" * commit '50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac': Don't use deleted Node object in setSizeScreenWidthAndScale
| * | | | | | | am 903d2ec9: Merge "Don\'t use deleted Node object in ↵Jean-Baptiste Queru2012-06-201-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setSizeScreenWidthAndScale" * commit '903d2ec97b2ac9cf4f50fc3d7f9e503611bce470': Don't use deleted Node object in setSizeScreenWidthAndScale
| | * | | | | | Merge "Don't use deleted Node object in setSizeScreenWidthAndScale"Jean-Baptiste Queru2012-06-201-1/+1
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Don't use deleted Node object in setSizeScreenWidthAndScaleMattias Falk2012-06-191-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to forceLayout may cause the Node object to be deleted. Avoid crash by check that the Node object is still valid when forceLayout has returned. Change-Id: Ieb74a59ca7f2e457b3b17d01bcb02cd566f84ef2
* | | | | | | Merge "Pin renderers to threads instead of tiles"Chris Craik2012-06-2012-53/+56
|\ \ \ \ \ \ \
| * | | | | | | Pin renderers to threads instead of tilesChris Craik2012-06-1912-53/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move thread local bitmaps to renderers, so the renderers own them, and can perform optimizations. Change-Id: I60d604759f4ce2ec9981990d1613eaf23cd1e625
* | | | | | | | Merge "Support recording context in PicturePile"John Reck2012-06-194-70/+108
|\ \ \ \ \ \ \ \
| * | | | | | | | Support recording context in PicturePileJohn Reck2012-06-194-70/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I920d4b967542354136b7f0102ec01c3386a3450a
* | | | | | | | | Merge "Fix GPL build"Chris Craik2012-06-193-1/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fix GPL buildChris Craik2012-06-193-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9d941bd59584b8a77b90e1f41b2c49a0e02e572
* | | | | | | | | Merge "Enable multiple tile painting threads"Chris Craik2012-06-196-44/+85
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Enable multiple tile painting threadsChris Craik2012-06-196-44/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use one thread by default. Further experiments should be done with determining the correct number of threads, and better scheduling. Change-Id: I2a87dac7d0b652b5ab627744650d12b0b8842003
* | | | | | | | Merge "Clip selected text within scrollable edit to the edit boundary."George Mount2012-06-193-3/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Clip selected text within scrollable edit to the edit boundary.George Mount2012-06-183-3/+37
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6666415 Change-Id: Ie19e6bc3eedcbb5c9eb5791ac4b1f55149dcdb72
* | | | | | | | am d548db16: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / * commit 'd548db16b0a9cd471bab55853f439ada9f1de1fe':
| * | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | Change-Id: I0c59ded668004ba779faa509ce4c52a74f9f846b
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | | |\ \ \ \
* | | | | \ \ \ \ Merge "When swapping, immediately start processing new work"Chris Craik2012-06-151-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | When swapping, immediately start processing new workChris Craik2012-06-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because no new work is enqueued after a SurfaceCollectionManager::swap(), there can be significant TexturesGenerator idle period before the next prepare of the new painting tree. This change removes that delay by preparing the new tree immediately. Change-Id: I061983abe7210f75d5e4f44d5dca79a0a47d329f
* | | | | | | | | | Merge "Remove unused and fix build warning"John Reck2012-06-153-22/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused and fix build warningJohn Reck2012-06-143-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68292b54638502d0769e6e8dbeea5d77eef901d0
* | | | | | | | | | | am 56b62670: (-s ours) am 4dd92d0a: DO NOT MERGE Respect the "Make password ↵George Mount2012-06-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | visible" setting. * commit '56b6267014bd17c262511e92d1d72ebefe8793c5': DO NOT MERGE Respect the "Make password visible" setting.
| * | | | | | | | | am 4dd92d0a: DO NOT MERGE Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dd92d0aeca7863ebbda83a97c37267c3fa09fb9': DO NOT MERGE Respect the "Make password visible" setting.
| | * | | | | | | | DO NOT MERGE Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6667146 Framework Change: I7fc107b02f73f4c54e8fe66484038ea9d7b69d61 Change-Id: I95ffcfa6fa47baad60b1af55f84bee35dfcc7972
* | | | | | | | | Merge "Respect the "Make password visible" setting."George Mount2012-06-141-2/+6
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6667146 Framework Change: I7fc107b02f73f4c54e8fe66484038ea9d7b69d61 Change-Id: I95ffcfa6fa47baad60b1af55f84bee35dfcc7972
* | | | | | | | Merge "Show layer tree in hierarchyviewer"John Reck2012-06-1411-122/+239
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Show layer tree in hierarchyviewerJohn Reck2012-06-1411-122/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a53b157d40c630e7ca1361f8e0c8aca1d6e8a4e
* | | | | | | | Add detailed tracing to tile paintingChris Craik2012-06-139-3/+40
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6653638 Change-Id: I839917feb1803bc1f4ace5aa2367067024a18706
* | | | | | | Merge "Revert "Revert "Add layer clip check to hide handles when not visible."""George Mount2012-06-121-0/+23
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c63158835c5027aa7245f331dc23f77cda96e192
* | | | | | | | am 101ff140: am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '101ff140ede0e7b633699bdb98bddd25b17b6eb2': Call the right updatePositions*
| * | | | | | | am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'b8dbaafe072de1d92a3de8d9be6165683a647ace': Call the right updatePositions*
| | * | | | | | Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-122-8/+8
| | |\ \ \ \ \ \
| | | * | | | | | Call the right updatePositions*John Reck2012-06-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6634077 Software was accidentally calling the inner updatePositions instead of the outer updatePositions which the hardware path calls. Move the inner updatePositions to be protected instead of public to guard against this in the future as well. Change-Id: Ib509f151ce64bf390383eaa0c32a2bae89428e89
* | | | | | | | | am d09512ae: am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | * commit 'd09512ae937be11ff906a1e2482c9b7166b45f73': Workaround double blit failure
| * | | | | | | am 9b2be716: Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b2be7161983b795edb1ea0e9e70547cd9e466bd': Workaround double blit failure
| | * | | | | | Merge "Workaround double blit failure" into jb-devChris Craik2012-06-123-0/+12
| | |\ \ \ \ \ \
| | | * | | | | | Workaround double blit failureChris Craik2012-06-123-0/+12
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An issue occurs on Stingray where calling glTexSubImage2d in order to blit an update to a texture fails silently if the texture has already been updated this frame. With this change, we now draw the tile off-screen to work around the issue just before the second blit is required. This way, the second blit succeeds. bug:6630040 Change-Id: I07213954669b0f3d3f5b87a748a591e532b097b4
* | | | | | | | am 45476c6e: am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '45476c6e0ef00a22165e498b3a8d673d46b6d1c6': Crash fix by checking null pointer
| * | | | | | | am a762e7bf: Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a762e7bf8891adc575b8b75cf79b710952ad090c': Crash fix by checking null pointer
| | * | | | | | Crash fix by checking null pointerTeng-Hui Zhu2012-06-121-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6579681 Regression from https://android-git.corp.google.com/g/#/c/197452/ Change-Id: If185faec6bb2d014c304afbb8ff752ebfc6e4b51
* | | | | | | Merge "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-23/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Revert "Add layer clip check to hide handles when not visible."George Mount2012-06-121-23/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 40369ea6114f406fef50d4241335dd8613372748