summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Sort the suggestions based based on the length of the text they are attached ↵Luca Zanolin2011-08-011-3/+36
| | | | | | | | | | too. When the suggestions are displayed, the shortest one will be at the top of the list, as they are the most relevant one. Bug: 5006130 Change-Id: Id3ac3accce5198a6a58a0c3028ee5f77957ceac6
* Merge "Updated backgrounds Bug: 5076695"Justin Ho2011-07-292-0/+0
|\
| * Updated backgroundsJustin Ho2011-07-292-0/+0
| | | | | | | | | | | | Bug: 5076695 Change-Id: Ifc1ee2a9c03b4620df1d27f65faf4c48826b14b6
* | Merge "SurfaceFlinger: fix a layer occlusion bug"Jamie Gennis2011-07-291-4/+6
|\ \
| * | SurfaceFlinger: fix a layer occlusion bugJamie Gennis2011-07-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a bug where the window visibility would be computed before any buffers were available, causing the window to be treated as non-opaque. When the first buffer arrived, if both mCurrentOpacity and the opacity determined by the buffer's format were 'opaque', a recomputation of the opacity would not be done, and the window would continue to be treated as non-opaque. SurfaceFlinger could then unnecessarily draw fully occluded layers. Change-Id: I2b95da2f4b50e68d50fc5afd8b772e26e62f58d6 Bug: 5057122
* | | Merge "Removing unnecessary textfield_active assets Bug: 5094669"Justin Ho2011-07-298-0/+0
|\ \ \
| * | | Removing unnecessary textfield_active assetsJustin Ho2011-07-298-0/+0
| | |/ | |/| | | | | | | | | | | | | Bug: 5094669 Change-Id: I239563cc75d62c1bffa2713e646531dd547752d2
* | | Trim HardwareRenderer memory more frequently.Romain Guy2011-07-291-0/+2
| | | | | | | | | | | | Change-Id: I92e72ce5da324f9ffcfdf7a54d8b368c2531799c
* | | Merge "add since flag for ICS"Scott Main2011-07-291-0/+1
|\ \ \
| * | | add since flag for ICSScott Main2011-07-271-0/+1
| | | | | | | | | | | | | | | | Change-Id: Id6d82f0ecd9f24af85a0fa7c4e712e4ea8a59bb3
* | | | Merge "Restore the 'final' bit on DataInputStream.read()"Jesse Wilson2011-07-291-0/+1
|\ \ \ \
| * | | | Restore the 'final' bit on DataInputStream.read()Jesse Wilson2011-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was lost in a recent refactoring. Change-Id: I31bc9cd5c4015135c4074d9b564edf5a9cc2ecd5
* | | | | Merge "Improving accessibility feedback for two state widgets."Svetoslav Ganov2011-07-2910-40/+106
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improving accessibility feedback for two state widgets.Svetoslav Ganov2011-07-2910-40/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Added population of sensible text for the state of the two state controls such as CheckBox, Switch, etc. This is important since if they are in a layout manager which fires an accessibility event there should be a description of the widget. bug:5092552 Change-Id: Ie3ca955653563496b84db379ae23a23fe88089a8
* | | | | Merge "Part of fix for bug 4997380: Some error types unknown to SslError"Kristian Monsen2011-07-291-1/+6
|\ \ \ \ \
| * | | | | Part of fix for bug 4997380: Some error types unknown to SslErrorKristian Monsen2011-07-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new SslError chromium error codes parser. Change-Id: I0b5584bd3f3e042600caebe72f4e41989318cd6a
* | | | | | Merge "Add a runtime switch between Raster and Ganesh rendering modes."Derek Sollenberger2011-07-292-1/+32
|\ \ \ \ \ \
| * | | | | | Add a runtime switch between Raster and Ganesh rendering modes.Derek Sollenberger2011-07-122-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are corresponding changes in: external/webkit -- change ID: 120660 packages/apps/Browser -- change ID: 120664 bug: 5013645 Change-Id: I4fc8ca6735a06682671ee06378c738ccf172e576
* | | | | | | Merge "resolved conflicts for merge of 13639b0d to master"Derek Sollenberger2011-07-290-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of 13639b0d to masterDerek Sollenberger2011-07-290-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6fb2ac2702fc662c1892537de6d4db20d5e709d6
| | * \ \ \ \ \ \ Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into ↵Derek Sollenberger2011-07-292-2/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-plus-aosp
| | | * \ \ \ \ \ \ resolved conflicts for merge of b7f09f28 to honeycomb-plus-aospDerek Sollenberger2011-07-292-2/+2
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
| | | | * \ \ \ \ \ \ am b7ed8471: am 01caec8c: Merge "Adding an optional param to the ↵Derek Sollenberger2011-07-291-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceTexture constructor." * commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93': Adding an optional param to the SurfaceTexture constructor.
| | | | | * \ \ \ \ \ \ am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."Derek Sollenberger2011-07-291-1/+1
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01caec8c4165a6cce2f276f8016b9eadab966944': Adding an optional param to the SurfaceTexture constructor.
| | | | | | * \ \ \ \ \ \ Merge "Adding an optional param to the SurfaceTexture constructor."Derek Sollenberger2011-07-291-1/+1
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Adding an optional param to the SurfaceTexture constructor.Derek Sollenberger2011-07-291-1/+1
| | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
* | | | | | | | | | | | | Merge "Clean up USB configuration switching logic and beef up error handling"Mike Lockwood2011-07-291-45/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Clean up USB configuration switching logic and beef up error handlingMike Lockwood2011-07-291-45/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5050853 Change-Id: Ia00698e2adbb8a7d7698e2ae306413f6c715fbdb
* | | | | | | | | | | | | | Merge "New interaction model for suggestions"Gilles Debunne2011-07-2911-165/+174
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | New interaction model for suggestionsGilles Debunne2011-07-2811-165/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Double tap and long press both start a text selection mode. The previous 'Paste' popup window associated with insertion handle is now also used in selection mode. It offers a new 'Replace' option that will popup the suggestion list. The HC paste/side/nopaste layout are no longer used. For the new action popup window, I also chose not to make the new background / text appearance styles themable in order to avoid the same problem in case this design evolves again. Known problems: the popup is not moved when the TextView is scrolled. the final visual style may change the "ADD TO DICT" option is missing from the suggestion list no interaction with the spell checker - There are different bugs open for each of these Change-Id: I167841f5ac017227fe4efa616eb935247250871a
* | | | | | | | | | | | | | Merge "Don't submit a query if it's whitespace only."Amith Yamasani2011-07-292-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Don't submit a query if it's whitespace only.Amith Yamasani2011-07-272-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just to maintain backward compatibility. It's not documented that a space is not a valid query, but it does make sense to expect that. Bug: 5079755 Also avoid showing an x by an empty query, by having the SearchDialog simulate an ActionBar. Change-Id: I3a9332286a439b659e179a249587c491ef29e5c1
* | | | | | | | | | | | | | | Merge "InputFilter not updated on global accessibility change."Svetoslav Ganov2011-07-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | InputFilter not updated on global accessibility change.Svetoslav Ganov2011-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35fd5fa078840abf62a3d5eac66b2eae1a79d01d
* | | | | | | | | | | | | | | Merge "Require the current backup pw in all backup/restore operations"Christopher Tate2011-07-296-43/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Require the current backup pw in all backup/restore operationsChristopher Tate2011-07-286-43/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, we now also require the current password to confirm any restore operation. Bug 4901637 Change-Id: I39ecce7837f70cd05778cb7e0e6390ad8f6fe3f3
* | | | | | | | | | | | | | | am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." ↵Robert Greenwalt2011-07-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8': Fix NPE when going from proxy to no proxy.
| * | | | | | | | | | | | | | am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into ↵Robert Greenwalt2011-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '1a230885b356256e91b3bf006ec72213ba6f8f76': Fix NPE when going from proxy to no proxy.
| | * | | | | | | | | | | | | Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTERobert Greenwalt2011-07-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix NPE when going from proxy to no proxy.Robert Greenwalt2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5081431 Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833
* | | | | | | | | | | | | | | | Merge "Quick fix for NPE in updateNotification()."Daniel Sandler2011-07-291-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Quick fix for NPE in updateNotification().Daniel Sandler2011-07-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the "ongoing"/"latest" split is removed, this will be replaced with something less odious. Bug: 5090331 Change-Id: Ib804de66985ff5f5df2e1df3c85437a1e31f1c49
* | | | | | | | | | | | | | | | | Merge "Various work on out of memory managment."Dianne Hackborn2011-07-2918-111/+596
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Various work on out of memory managment.Dianne Hackborn2011-07-2918-111/+596
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve how we handle processes that have shown UI, to take care of more cases where we want to push them into the background LRU list. - New trim memory level for when an application that has done UI is no longer visible to the user. - Add APIs to get new trim memory callback. - Add a host of new bind flags to tweak how the system will adjust the OOM level of the target process. Change-Id: I23ba354112f411a9f8773a67426b4dff85fa2439
* | | | | | | | | | | | | | | | | Merge "Fix NinePatch decoder when the target is smaller than the source."Derek Sollenberger2011-07-291-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix NinePatch decoder when the target is smaller than the source.Derek Sollenberger2011-07-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the target is smaller on a given axis than the source then we just draw a downscaled version of the NinePatch. If we use the current path and the source has transparency then areas of the NinePatch overlap and are blended together resulting in visual inconsistancy. bug: 5041053 Change-Id: I0fcc6fb5c214b188a164acf0651aa4ab2f35946d
* | | | | | | | | | | | | | | | | Merge "Fix NPE for devices with hardware navigation."Daniel Sandler2011-07-291-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix NPE for devices with hardware navigation.Daniel Sandler2011-07-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5095974 Change-Id: I4d8c39fbff6feb7b65055938ac0f725faaa6e6a3
* | | | | | | | | | | | | | | | | Merge "Workaround for bug 5082381 (EALREADY on ACL collision)."Nick Pelly2011-07-291-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Workaround for bug 5082381 (EALREADY on ACL collision).Nick Pelly2011-07-281-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If connect() fails with EALREADY, then retry. Unfortunately we also need to switch to a new FD. This is currently safe, but its a little fragile to changes in the code (especially if we ever expose the fd to applications) so it would be great to fix this issue properly in the kernel sometime and revert this commit. Change-Id: I12fb6b7f2b8ca40f425f66b504754048c9460329