summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix fill color alpha in layoutlib"Tor Norbye2010-11-121-1/+1
|\
| * Fix fill color alpha in layoutlibTor Norbye2010-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | new Color(int) ignores the upper 8 bits - it creates a color without an alpha channel. In order to pass in rgba we have to use a different constructor, new Color(int,true). (In the layout library API we should also specify that the custom color, if specified, needs to include an alpha, or in particular add in 0xFF<<24 if the color is opaque.) Change-Id: I1c44caed8a5780e61b1c799f3b45bef3eb7bc97b
* | Merge "Fix bug 3146938 - Menus spawned by ActionBar should hide when action ↵Adam Powell2010-11-123-7/+32
|\ \ | | | | | | | | | bar is hidden"
| * | Fix bug 3146938 - Menus spawned by ActionBar should hide when actionAdam Powell2010-11-113-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bar is hidden Any popup spawned by the private class MenuPopupHelper will be hidden if its anchor becomes hidden. ("hidden" == !View#isShown()) Fix a bug where ActionBar subtitle views were not going away when subtitle text was set to null. Fix a bug when switching out of ActionBar tabbed nav mode with no active tabs. Change-Id: I1f30c067156221f96905ac69ab876418ad2e94f8
* | | Merge "Improve logging"Alon Albert2010-11-122-33/+18
|\ \ \
| * | | Improve loggingAlon Albert2010-11-112-33/+18
| | | | | | | | | | | | | | | | Change-Id: Ia855b1a45a3abbc1a87233462f19b330b72d30b9
* | | | Merge "Don't call cancel discovery when its already canceelled."Jaikumar Ganesh2010-11-121-2/+0
|\ \ \ \
| * | | | Don't call cancel discovery when its already canceelled.Jaikumar Ganesh2010-11-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by: Leijun Tao Change-Id: I5f04ecde16d147776a30810210cd3c973aee4d87
* | | | | Merge "Make getDataEnabled take more into account."Robert Greenwalt2010-11-121-4/+6
|\ \ \ \ \
| * | | | | Make getDataEnabled take more into account.Robert Greenwalt2010-11-111-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getDataEnabled and getAnyDataEnabled ignored mMasterDataEnabled. bug: 2216392 Change-Id: Ic3ae0808d2a02057ddf5056d3e01f754f2e57f5c
* | | | | | Work on lining up the TextView and web page text.Leon Scroggins2010-11-122-31/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3085564 Do not round the text size when applying it to the WebTextView, so that it will better line up with the text shown on the web page. Modify the WebTextView paint to better match the paint used by webkit. Update the padding when the zoom level changes. Change-Id: I284a6febcba2be21dc1ab3f74c6ab5751e1b19b6
* | | | | | Add Theme.Holo.DialogWhenLargeDianne Hackborn2010-11-115-6/+140
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This theme gives you a dialog look when running on a large or xlarge screen, otherwise a regular full-screen activity. Also some new Fragment convenience APIs. Change-Id: I3d97928ffaa4f3bdfd0cc5daf8823f9235c4ba68
* | | | | Add password expiration support to DevicePolicyManager.Jim Miller2010-11-117-6/+402
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib2629ec547c123ac489d7f4cbd4e0a1d4aa07620
* | | | | Merge "Invalidate transitions when an image media item duration changes."Gil Dobjanschi2010-11-112-60/+111
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Invalidate transitions when an image media item duration changes.Gil Dobjanschi2010-11-112-60/+111
| | | | | | | | | | | | | | | | | | | | Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
* | | | | Merge "Add new keycodes initially used for GoogleTV devices."Jeff Brown2010-11-115-2/+397
|\ \ \ \ \
| * | | | | Add new keycodes initially used for GoogleTV devices.Jason Bayer2010-11-115-2/+397
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b901037d6d401931dd3ec6f7d5e1e6ad165d1c9
* | | | | | Merge "Bug 3183184 - add fade-out for selectable item backgrounds"Adam Powell2010-11-112-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug 3183184 - add fade-out for selectable item backgroundsAdam Powell2010-11-112-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2a1ff4eb7177509f08c20e39bbf1dbf5c25dd5f
* | | | | | Merge "Misc fix in layoutlib bridge + View.isIneditMode as delegate."Xavier Ducrohet2010-11-118-34/+56
|\ \ \ \ \ \
| * | | | | | Misc fix in layoutlib bridge + View.isIneditMode as delegate.Xavier Ducrohet2010-11-118-34/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ideab29167e933203da99d4270cebcb777726201f
* | | | | | | Merge "Temporary workaround for issue 3187563"Eric Laurent2010-11-111-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Temporary workaround for issue 3187563Eric Laurent2010-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio HAL does not always handle properly simultaneous input and output stream state changes. This happens in particular when starting video record because output stream starts and stops while input is active. Temporary disable the video record jingle the time the audio HAL issues are solved. Change-Id: I3b923d81af543a335deae9e22d7f396bb5791d91
* | | | | | | | Merge "Increase the prefetcher's low water mark so it restarts fetching data ↵Andreas Huber2010-11-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | earlier."
| * | | | | | | | Increase the prefetcher's low water mark so it restarts fetching data earlier.Andreas Huber2010-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 720p high bitrate content pretty much requires this. Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
* | | | | | | | | am 16555c60: am d6b9d078: Merge "docs: misc changes to sdk setup docs update ↵Scott Main2010-11-114-74/+91
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread * commit '16555c60f7231b014375cbc62fd83b1c53879984': docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
| * \ \ \ \ \ \ \ \ am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager ↵Scott Main2010-11-114-74/+91
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread * commit 'd6b9d078ecf1b4d7cc57375830cf2ce390fc893c': docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
| | * \ \ \ \ \ \ \ \ Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; ↵Scott Main2010-11-114-74/+91
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update info about new manager UI; more info about the windows installer;" into gingerbread
| | | * | | | | | | | | docs: misc changes to sdk setup docsScott Main2010-11-114-74/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update sdk manager screenshot; update info about new manager UI; more info about the windows installer; Change-Id: Ic4a582ba28f02e2c787901a575194ae884be396e
* | | | | | | | | | | | Merge "GsmServiceStateTracker#getPhone should be protected not public."Wink Saville2010-11-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | GsmServiceStateTracker#getPhone should be protected not public.Wink Saville2010-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie8c1ac0a38616e4794aa51b9b642d9b22008b9ff
* | | | | | | | | | | | | Merge "Use deliberately public API rather than org.apache cruft."Elliott Hughes2010-11-111-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use deliberately public API rather than org.apache cruft.Elliott Hughes2010-11-111-6/+3
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputStreamHelper is scheduled for deletion. As a bonus, the new code is more efficient. Change-Id: Ied8b87fa24f8506cf748b0d4c99ee7e2ae201483
* | | | | | | | | | | | | make ResourceCache for display lists thread-safeChet Haase2010-11-112-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41885b4ae249d7d7c000bab17bf32340ba85ab3a
* | | | | | | | | | | | | Merge "add column to downloads table to store error msg when a download fails"Vasu Nori2010-11-111-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | add column to downloads table to store error msg when a download failsVasu Nori2010-11-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | useful for debugging for bugs like bug:3187299 without this error message, one doesn't know WHY downloads fail. there is a STOPSHIP comment around storage of this error message in database. Change-Id: I1fa49ee9eb97be16aced1611ab30a286b0b6c8d2
* | | | | | | | | | | | | Merge "First pass at styling progress bars for Holo."Adam Powell2010-11-1120-11/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | First pass at styling progress bars for Holo.Adam Powell2010-11-1120-11/+104
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added attribute to let scale drawables size based on the intrinsic width and height as a minimum. This helps prevent artifacts when some 9-patches are used in situations like progress bars. Change-Id: I168a232d3225afe9b5578a05a9b8634a1084404c
* | | | | | | | | | | | | am 9acf04ab: (-s ours) am 3082e5fe: Merge "Import revised translations. DO ↵Eric Fischer2010-11-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | / / / / / / | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread * commit '9acf04ab6a6327449f46e83679ec54967e092944': Import revised translations. DO NOT MERGE
| * | | | | | | | | | | am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-11-113-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3082e5fed04c42301c89de8df36e9d62f0937dec': Import revised translations. DO NOT MERGE
| | * | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-11-113-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2010-11-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6178ba6468bf9e1dd52a83652c857a6e75f2661b
* | | | | | | | | | | | | Merge "Make sure the prefetcher is actively fetching data if we pause ↵Andreas Huber2010-11-114-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback due to cache underrun."
| * | | | | | | | | | | | | Make sure the prefetcher is actively fetching data if we pause playback due ↵Andreas Huber2010-11-114-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to cache underrun. Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3 Conflicts: media/libstagefright/AwesomePlayer.cpp
* | | | | | | | | | | | | | Merge "Free resources only from the GL context thread. Bug #3179882"Romain Guy2010-11-1113-66/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Free resources only from the GL context thread.Romain Guy2010-11-1113-66/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3179882 Resources were freed following garbage collections on a worker thread. This worker thread had no EGL context, which would cause the renderer to incorrectly assume that the memory was liberated. Change-Id: Ifdb51f94ddf42641e8654522787bfac532976c7c
* | | | | | | | | | | | | | | Merge "Fix crash in dump function."Jaikumar Ganesh2010-11-111-26/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix crash in dump function.Jaikumar Ganesh2010-11-111-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a4cd7cf3fd325ced5d05f036c191f759dee16e0
* | | | | | | | | | | | | | Merge "Implement reducing the buffer count of a Surface."Jamie Gennis2010-11-116-10/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Implement reducing the buffer count of a Surface.Jamie Gennis2010-11-116-10/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f979c60c06d654aa8265002836277434bc1a64f Bug: 3095167