summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "fix scrollable layer inside scrollable layer"Michael Kolb2012-02-241-4/+7
|\
| * fix scrollable layer inside scrollable layerMichael Kolb2012-02-241-4/+7
| | | | | | | | | | | | | | | | | | Bug: 6065371 take the layer offset out of the transformation matrix used for the children. Change-Id: I464eda636df50c98e2042687c80f4a2c4a9bddc3
* | Merge "Fix issues when DEBUG turned on"Teng-Hui Zhu2012-02-243-5/+8
|\ \
| * | Fix issues when DEBUG turned onTeng-Hui Zhu2012-02-243-5/+8
| | | | | | | | | | | | Change-Id: Ifeeed93859f3b9122cf6e2aa3ae66d6cfa603dce
* | | Fix NPE crashJohn Reck2012-02-241-1/+2
| | | | | | | | | | | | | | | | | | Bug: 6064378 Change-Id: I0dfb596df31b72e52e8b7846d6bcfffefb1b8403
* | | Merge "disable navcache"John Reck2012-02-241-1/+1
|\ \ \ | |/ / |/| |
| * | disable navcacheJohn Reck2012-02-231-1/+1
| | | | | | | | | | | | Change-Id: I5f914abfccaad06714838e0f6ac3ecef34e85f2f
* | | Merge "Selection node used for selection region rather than focus node."George Mount2012-02-241-5/+5
|\ \ \ | |/ / |/| |
| * | Selection node used for selection region rather than focus node.George Mount2012-02-231-5/+5
| | | | | | | | | | | | | | | | | | Bug 6059606 Change-Id: I6be963f30adef0c1dab19399d0eb505b4d0452d3
* | | Merge "Support phone & email address detection"John Reck2012-02-234-1/+451
|\ \ \ | |_|/ |/| |
| * | Support phone & email address detectionJohn Reck2012-02-234-1/+451
| | | | | | | | | | | | Change-Id: Ib5d671eb67d48ea29a0a16a99101eba904a8951c
* | | Merge "Revert "simplify texture generation filters""Chris Craik2012-02-2312-94/+115
|\ \ \
| * | | Revert "simplify texture generation filters"Chris Craik2012-02-2312-94/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems to be a problem with the refcounting. bug:6050242 bug:6058365 This reverts commit 92a7e4bc6b67b150cbb30f78374173ecfeb43607
* | | | Merge "draw inactive find-on-page matches as outlines"Victoria Lease2012-02-234-0/+30
|\ \ \ \
| * | | | draw inactive find-on-page matches as outlinesVictoria Lease2012-02-234-0/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: Iacbeba1fb4e3c63f8f40c61c8b641c0b6c704cad
* | | | | Merge "Support address detection"John Reck2012-02-2320-18/+1777
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Support address detectionJohn Reck2012-02-2320-18/+1777
| | |/ | |/| | | | | | | Change-Id: I88b6ebfb4c967e954a2420592a58af3ed188226d
* | | Merge "Fix overflow clipping of images in auto-fit mode."Mangesh Ghiware2012-02-231-0/+4
|\ \ \ | |/ / |/| |
| * | Fix overflow clipping of images in auto-fit mode.Mangesh Ghiware2012-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In auto-fit mode, text is wrapped based on screen width. However, if overflow isn't visible for the content box, and it includes block elements, they may get clipped. Disable overflow clipping in this scenario. Bug: 6034321 Change-Id: I1e274df3b5698fb4142e2f0ae4c68578e26d2af4
* | | Merge "Drop support for Android HTTP stack"Steve Block2012-02-2322-776/+20
|\ \ \
| * | | Drop support for Android HTTP stackSteve Block2012-02-2222-776/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All future releases will use the Chromium HTTP stack and maintaining two HTTP stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we now use V8 in all build targets (b/5495373), so we can safely drop the Android HTTP stack. See corresponding framework change https://android-git.corp.google.com/g/166325. Bug: 5495616 Change-Id: I41117b6750fbc1c84cbd4a5951b0d1a457354f93
* | | | Add caret thumb following selection handle logic.George Mount2012-02-221-31/+58
| |/ / |/| | | | | | | | | | | | | | Framework Change: I669653ca6890fe1136fdd42e24f4c3a34c00d1e4 Change-Id: I3cb0499c5fa3a7de241025d9be04ff44f54f2a74
* | | Get input type for text field so that autocorrect works.George Mount2012-02-222-2/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5987568 Get the input type and other necessary information for setting up the IME. Framework Change: Ic8c14687a70727148dfc8115c46f09530ca0c0f6 Change-Id: I7eceafdbede8b7b463590a2e875a237241479ad1
* | | Merge "scroll page to current match during find-on-page"Victoria Lease2012-02-221-0/+2
|\ \ \
| * | | scroll page to current match during find-on-pageVictoria Lease2012-02-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6044659 Change-Id: I7e6e59b365aec0b01c41cb80e4c342f39142b867
* | | | Merge "Reset the upper limit when onTrimMemory"Teng-Hui Zhu2012-02-221-1/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Reset the upper limit when onTrimMemoryTeng-Hui Zhu2012-02-211-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | bug:6009351 Change-Id: I2619a4adc965014a749d575292137cf23c59b8c3
* | | | Remove unused cache methodsSteve Block2012-02-221-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebFrame::SetCacheDisabled() has been unused since https://mondrian.corp.google.com/changelist/33679-p9, so the WebCore cache is always enabled. WebFrame::CacheDisabled() has been unused since https://mondrian.corp.google.com/changelist/32803-p9 (see change to WebView). See framework change https://android-git.corp.google.com/g/167297. Change-Id: I4040aa24a1b269d506623ffbc5c0cf3d8353be0c
* | | | Merge changes I6312736c,I55a2ecd2Steve Block2012-02-2211-711/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove benchmark tool Fix comments for willLoadFromCache()
| * | | | Remove benchmark toolSteve Block2012-02-219-707/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This relies on use of the Android HTTP stack, which hasn't been used since before HC, so is of little value. Bug: 5458617 Change-Id: I6312736cb139cd7a4e295e1cb6390d2a797fd37b
| * | | | Fix comments for willLoadFromCache()Steve Block2012-02-212-4/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This method is used by both the Android and Chromium HTTP stacks, so does not always call through to Java. Change-Id: I55a2ecd2db8ee29815048d217a9b0a2f4824750e
* | | | remove dependency on RGB_332Mathias Agopian2012-02-211-2/+1
| | | | | | | | | | | | | | | | Change-Id: I0103e263ec1b19e9dffc0aa63ac8affcbe578dec
* | | | Merge "Move Canvas elements to their own composited layer"Nicolas Roard2012-02-212-0/+11
|\ \ \ \
| * | | | Move Canvas elements to their own composited layerNicolas Roard2012-02-212-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This drastically improves performances, as invalidating a canvas will only touch that one layer instead of (possibly) invalidating the entire PictureSet. bug:5247823 Change-Id: Iec4de74d25e58e63f0198bbd7558c461d9a11cfd
* | | | | Merge "Improve keyboard navigation cursor rings"John Reck2012-02-216-127/+79
|\ \ \ \ \
| * | | | | Improve keyboard navigation cursor ringsJohn Reck2012-02-216-127/+79
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I2b11c0b0011104c5a3515ed138a9077dfe8b4ce1
* | | | | Merge "Add two missing null checks"John Reck2012-02-212-1/+3
|\ \ \ \ \
| * | | | | Add two missing null checksJohn Reck2012-02-212-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6008243 Change-Id: I32df636933d77dc9d7174f7a025a1ee70bb945fa
* | | | | Merge "frameworks/base refactoring."Mathias Agopian2012-02-211-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | frameworks/base refactoring.Mathias Agopian2012-02-201-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | update makefiles Change-Id: I0d388bd9156916fb91199e407679b814dcfb580f
* | | | async find-on-page implementation via WebKitVictoria Lease2012-02-2110-1264/+157
|/ / / | | | | | | | | | Change-Id: I5804c865f4bce6452213dc89337ff6a5e6100c9e
* | | frameworks/base refactoring.Mathias Agopian2012-02-179-13/+13
| | | | | | | | | | | | | | | | | | step 2: move libutils headers to their new home in androidfw. Change-Id: I5e97cfccf6828bc37207b92fbfe301b1ca31df4c
* | | frameworks/base refactoring.Mathias Agopian2012-02-174-4/+4
| | | | | | | | | | | | | | | | | | First step. Move libui headers to their new home. Change-Id: I2e770e6b53c2f34432b0df2937c4cc33af6dc52b
* | | Merge "simplify texture generation filters"Chris Craik2012-02-1712-115/+94
|\ \ \ | | |/ | |/|
| * | simplify texture generation filtersChris Craik2012-02-1612-115/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filters can no longer block, which removes the need for transfer queue interruption. The filter no longer touches the currently painting tile. Tiles are now all ref-counted to accomodate the container being deleted while one of its tiles is still painting. Change-Id: Iaa4848665efdf90846defb0a53bf1ea013b8421b
* | | Merge "Fix rounding error in clip"Chris Craik2012-02-174-64/+71
|\ \ \
| * | | Fix rounding error in clipChris Craik2012-02-164-64/+71
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5460425 Was intermittently causing top row of pixels in a layer to be incorrectly clipped. Additionally, cleaned up shader draw setup. Change-Id: Ib089354a1953e9a574e58a459d5f3623cc68dd21
* | | am de80f9ac: (-s ours) am 98087315: am 2285ad26: Merge "Only check ↵Jean-Baptiste Queru2012-02-160-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm" * commit 'de80f9aca96fa19963bf6c644b26630e4d5e9958': Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm
| * \ \ am 98087315: am 2285ad26: Merge "Only check ARCH_ARM_HAVE_ARMV7A if ↵Jean-Baptiste Queru2012-02-161-4/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET_ARCH is arm" * commit '9808731553f1fad0792ff2f336dc4974177d413d': Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm
| | * \ \ am 2285ad26: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"Jean-Baptiste Queru2012-02-161-4/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2285ad26b6524cc5a71f5282f8bd18a5ba9ce028': Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm