summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Support selections within scrollable text areas."George Mount2012-06-042-40/+56
|\
| * Support selections within scrollable text areas.George Mount2012-06-042-40/+56
| | | | | | | | | | | | | | | | | | Bug 6557816 Change text selection to modify only the base or extent, not both points of the selection. Framework Change: I355b21e9062b5d364cfb278fda239a4ecdff16d1 Change-Id: I9a08633160eeb14d5c45246c6128aa02c1642e8d
* | Merge "Change from left/right to base/extent for selection handles."George Mount2012-06-044-23/+62
|\ \ | |/
| * Change from left/right to base/extent for selection handles.George Mount2012-06-014-23/+62
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6557816 This is a step in preparation to fix text area selection. It moves selection from left/right to base/extent. left/right can cause problems when dragging cursors -- it is sometimes difficult to tell which cursor should be dragged, the left or right, but we can always keep the base/extent constant. Framework Change: I2f9b963e93bb1ab86a9b26518fca52449b56d5d9 Change-Id: I5609d07ea2ee67fc08d15cfcad31f49302f33297
* | am c2973319: am 06100d01: Merge "Disable clipping on the base surface" into ↵Chris Craik2012-06-022-11/+14
|\ \ | | | | | | | | | | | | | | | | | | jb-dev * commit 'c29733197c3c7e09fb276016a8b492412ca9e64f': Disable clipping on the base surface
| * \ am 06100d01: Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| |\ \ | | | | | | | | | | | | | | | | * commit '06100d01966af4c0332fd964d9deb20f052c308d': Disable clipping on the base surface
| | * \ Merge "Disable clipping on the base surface" into jb-devChris Craik2012-06-022-11/+14
| | |\ \
| | | * | Disable clipping on the base surfaceChris Craik2012-06-012-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base surface can expand dynamically (see BaseLayerAndroid::updatePosition) to fill the viewport, so disable clipping on it. bug:6593707 Change-Id: I3afafb28fbe95d3162c76f8e835932577ded65ce
* | | | | am f3e42950: am 6b850721: Fixed mistake in how label was being mistakenly ↵George Mount2012-06-011-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | set into name. * commit 'f3e429507eba1a13e9afaf436e240fd81797c646': Fixed mistake in how label was being mistakenly set into name.
| * | | | am 6b850721: Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '6b850721064920ae1ddb114964c5c2bb4a745532': Fixed mistake in how label was being mistakenly set into name.
| | * | | Fixed mistake in how label was being mistakenly set into name.George Mount2012-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6594983 Change-Id: I8adf636345e5d5284e372e28176c31c7e937334d
* | | | | am c6990706: am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c69907062387aaedf35962337b254c01893d398b': Fix document.createTouchList crash.
| * | | | am 678de4ac: Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '678de4acf72e6fd4c6fb9426d2c69445acc18135': Fix document.createTouchList crash.
| | * | | Fix document.createTouchList crash.Ben Murdoch2012-06-016-10/+60
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick of WebKit r119158. Note the layout test is tweaked slighly from upstream to make it happy in our older webkit snapshot. See: http://trac.webkit.org/changeset/119158 Bug: 6578213 Change-Id: Id6cc23938b5139cf0416e3d4c6e7ba227b1b6a0c
* | | | am c40f87a1: am b5d3edac: Merge "Invalidate webview content on ↵Chris Craik2012-05-311-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | setBackgroundColor" into jb-dev * commit 'c40f87a1970b5377976087f2ffb4f0c621d39fd5': Invalidate webview content on setBackgroundColor
| * | | am b5d3edac: Merge "Invalidate webview content on setBackgroundColor" into ↵Chris Craik2012-05-311-0/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'b5d3edac71ca2c54cbf9ce5bf42cc7727216ac09': Invalidate webview content on setBackgroundColor
| | * | Merge "Invalidate webview content on setBackgroundColor" into jb-devChris Craik2012-05-311-0/+7
| | |\ \
| | | * | Invalidate webview content on setBackgroundColorChris Craik2012-05-311-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | bug:6593154 Change-Id: Ic9438f758c7c67d0a2e0579dbc53dcdf8dd109cd
* | | | | am 9af7514f: am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9af7514f84d41c3aa4add011ef0ffe5af04e7143': Don't allow merging within an animated layer
| * | | | am effdd108: Don\'t allow merging within an animated layerChris Craik2012-05-312-7/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'effdd108fdcbfad1612f8be305ea716bdd7d927e': Don't allow merging within an animated layer
| | * | | Don't allow merging within an animated layerChris Craik2012-05-312-7/+12
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Also isolates layer translation fudging so as to not affect child transforms. bug:6585341 Change-Id: If416c6fad90ee37fbe3438e01706b34e683165b7
* | | | am b1005282: am 150a26fa: Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'b10052827bf3e6263912013b2daaf928a63508e8': Fix animation in single surface mode
| * | am 150a26fa: Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
| |\ \ | | |/ | | | | | | | | | * commit '150a26fa5442a5fc931e5df05808e33aac1a7dea': Fix animation in single surface mode
| | * Fix animation in single surface modeTeng-Hui Zhu2012-05-314-27/+27
| | | | | | | | | | | | | | | | | | bug:5683630 Change-Id: I4d617962a8412de884903f150799f733ea996e1c
* | | am 5ace2391: am 6f60c96b: Merge "Don\'t override X-Requested-With if it is ↵John Reck2012-05-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | already set" into jb-dev * commit '5ace239149deab659c929c2b77c44d1dd0588801': Don't override X-Requested-With if it is already set
| * | am 6f60c96b: Merge "Don\'t override X-Requested-With if it is already set" ↵John Reck2012-05-301-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | into jb-dev * commit '6f60c96bbd87b5c54d89aeb23ace06ae3647e2f3': Don't override X-Requested-With if it is already set
| | * Merge "Don't override X-Requested-With if it is already set" into jb-devJohn Reck2012-05-301-1/+1
| | |\
| | | * Don't override X-Requested-With if it is already setJohn Reck2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6547248 Change-Id: I50490abec1ac62a94acb750182e9ae70a5a654e9
* | | | am 5ce4bd8d: am db590796: Merge "Minimize tearing for fixed element in ↵Teng-Hui Zhu2012-05-306-12/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | single surface mode" into jb-dev * commit '5ce4bd8decc0c23f3727397652e4b9d9193f6d3e': Minimize tearing for fixed element in single surface mode
| * | | am db590796: Merge "Minimize tearing for fixed element in single surface ↵Teng-Hui Zhu2012-05-306-12/+28
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | mode" into jb-dev * commit 'db590796ce589844c92205685ffae83c86b168f0': Minimize tearing for fixed element in single surface mode
| | * | Merge "Minimize tearing for fixed element in single surface mode" into jb-devTeng-Hui Zhu2012-05-306-12/+28
| | |\ \
| | | * | Minimize tearing for fixed element in single surface modeTeng-Hui Zhu2012-05-306-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5683630 Change-Id: I43f738f2649a79b4ad7865ed27375c07195fa9b9
* | | | | am 08241ef7: am e4d0c197: Merge "Draw entire layer tree in capturePicture()" ↵Chris Craik2012-05-302-2/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '08241ef71160ccc36c2e104ad8c1092dc293a9d3': Draw entire layer tree in capturePicture()
| * | | | am e4d0c197: Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-302-2/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'e4d0c1973ec857d1408499010dca9f6856cecdd1': Draw entire layer tree in capturePicture()
| | * | | Merge "Draw entire layer tree in capturePicture()" into jb-devChris Craik2012-05-302-2/+11
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Draw entire layer tree in capturePicture()Chris Craik2012-05-302-2/+11
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Also fixes matrix initialization in BaseLayerAndroid::getLocalTransform() bug:6389297 Change-Id: I6a3df3de129aa263986c5082614d8d76bc7408f7
* | | | am 97a832f0: Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '97a832f0097d2baa671692d428a2897277f9a539':
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ic2ce89367e0f7ecc86f6741a05497ad47185bb22
| | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| | |\ \ \
* | | \ \ \ am c83120b4: am 658c3ec9: Merge "Consider frame offset for text snap ↵George Mount2012-05-302-19/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rectangle." into jb-dev * commit 'c83120b4d089eed50a8c819256f065457529b862': Consider frame offset for text snap rectangle.
| * | | | | am 658c3ec9: Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '658c3ec9fdfa61bec9bd765999bb98dc8b1bfd40': Consider frame offset for text snap rectangle.
| | * | | | Merge "Consider frame offset for text snap rectangle." into jb-devGeorge Mount2012-05-302-19/+13
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Consider frame offset for text snap rectangle.George Mount2012-05-292-19/+13
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Bug 6556824 Change-Id: I2c39bf3d7461cfe21e33fd18ab798ca824cbdd96
* | | | | am 1d51221c: am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" ↵John Reck2012-05-293-2/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '1d51221cb2f00354a8d78776caaaa04347e9b61b': Don't use setupPaintFill for drawBitmap
| * | | | am 4a0b0816: Merge "Don\'t use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4a0b0816608c283488485073839d944a077b15e8': Don't use setupPaintFill for drawBitmap
| | * | | Merge "Don't use setupPaintFill for drawBitmap" into jb-devJohn Reck2012-05-293-2/+15
| | |\ \ \
| | | * | | Don't use setupPaintFill for drawBitmapJohn Reck2012-05-293-2/+15
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6505013 When drawing a bitmap, don't use setupPaintFill(). The reason is that setupPaintFill will use the fillColor to influence the alpha set on the SkPaint. However, that fillColor does not apply to the bitmap, and can have the result of applying the wrong alpha (as the alpha set is fillColor alpha * graphicsContext's alpha). Instead, set the alpha on the paint directly and use setupPaintCommon Change-Id: Ib8d7ef494593a2896e6e3ed03c00d8d4d4b7232a
* | | | | am 07e81ac8: am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '07e81ac8f155f768bd769b95efd758c6acb9d6a6': Fix for wrong positioning
| * | | | am 86c18a99: Fix for wrong positioningNicolas Roard2012-05-291-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '86c18a99738c3f0c6afd5a4949be274f7d7522fd': Fix for wrong positioning
| | * | | Fix for wrong positioningNicolas Roard2012-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | bug:6560078 Change-Id: I1ef7b3e6398f1cb9a80027a6917d9a557deb8c6f
generated by cgit v1.1 at 2024-09-10 04:27:21 +0000