Mathias Agopian
42d095aaa5
Merge "fix [2363506] [Sapphire] Video playback broken"
2010-01-20 13:44:53 -08:00
Mathias Agopian
1faed66086
fix [2363506] [Sapphire] Video playback broken
...
don't try to use copybit for incompatible buffers
2010-01-20 13:24:14 -08:00
Makoto Onuki
f221217a67
Merge "DomainNameValiator: Remove workaround"
2010-01-20 12:03:24 -08:00
Andreas Huber
59314535b9
Merge "Adds support for 8-bit (unsigned) PCM wave files."
2010-01-20 11:43:25 -08:00
Andreas Huber
e1096b515e
Merge "Support for 'iTunes-style' metadata in .mp4 and .3gp files."
2010-01-20 11:35:02 -08:00
Eric Laurent
f05b4a481d
Merge "Create base class for audio policy manager."
2010-01-20 10:03:36 -08:00
Makoto Onuki
eac7055b40
DomainNameValiator: Remove workaround
...
Remove the workaround introduced in CL 68137-p9.
Validation should fail when a certification can't be parsed.
Bug: 2369689
2010-01-20 09:58:42 -08:00
Makoto Onuki
73b2c3c505
Merge "Addign more tests for DomainNameValidator."
2010-01-20 09:22:42 -08:00
Tom O'Neill
2e419abb0f
Merge "Get rid of a TODO to add documentation for now-hidden columns"
2010-01-20 09:15:14 -08:00
Jason Sams
3b7cc73151
Merge "Fix RS mipmap generation for 8 bit alpha textures."
2010-01-19 17:54:27 -08:00
Romain Guy
d5c111d3c6
Merge "Measure AutoCompleteTextView's dropdown to have enough room for all items. Bug #2363514 "
2010-01-19 16:57:51 -08:00
Joe Onorato
f69cd0e98d
Merge "Add DateTimeView, a widget that shows a time or the date depending on the current time. Use that for notifications instead of a TextView that doesn't ever update."
2010-01-19 16:45:05 -08:00
Scott Main
6506626c48
am 7cc57ff2: am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair
...
Merge commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea'
* commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea':
docs: remove dev guide link from download confirmation content
2010-01-19 16:35:10 -08:00
Xavier Ducrohet
295df3eb5a
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2010-01-19 16:35:00 -08:00
Joe Onorato
a4d81b947b
Merge "Make the space between the time and the AM/PM smaller by putting preceding whitespace inside the span."
2010-01-19 16:34:58 -08:00
Xavier Ducrohet
5e4cc6541d
am f95e3dd2: am 5e083024: ADT/Layoutlib: shader clean-up.
...
Merge commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a'
* commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a':
ADT/Layoutlib: shader clean-up.
2010-01-19 16:34:48 -08:00
Xavier Ducrohet
28b9e8dc98
am e1a99147: am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into eclair
...
Merge commit 'e1a991476365cf1a8249c842e2b936db6940b0a7'
* commit 'e1a991476365cf1a8249c842e2b936db6940b0a7':
ADT/Layoutlib: 2 color, linear gradient support.
2010-01-19 16:34:32 -08:00
Grace Kloba
9b352fe319
am 181963a0: (-s ours) am 196926b9: Merge "DO NOT MERGE" into eclair
...
Merge commit '181963a0200e7c442d66f9f893da41e2b52a4d8c'
* commit '181963a0200e7c442d66f9f893da41e2b52a4d8c':
DO NOT MERGE
2010-01-19 16:34:11 -08:00
Makoto Onuki
1b925b0998
Addign more tests for DomainNameValidator.
...
Added tests that use actual certificates.
See bug:2369689 for background.
2010-01-19 15:03:10 -08:00
Suchi Amalapurapu
fbf4202c89
Merge "Mount/Unmount secure containers Persist flags in PackageSetting. Flags are relevant to ApplicationInfo.FLAG_SYSTEM, Application.FLAG_ON_SDCARD, ApplicationInfo.FLAG_FORWARD_LOCK. New pm command to simulate mount/unmount in Pm. This will be removed when MountService/vold event generation gets fixed. Calls from MountService into PackageManager when media gets mounted/unmounted. Scan the packages and grant permissions when the sdcard gets mounted. This api might change again."
2010-01-19 14:11:43 -08:00
Andreas Huber
e9bcc2d714
Merge "Fix trailing garbage after UCS-2 encoded strings in ID3 V2."
2010-01-19 14:05:46 -08:00
Andreas Huber
8109b50a99
Merge "Support for ID3 version 1 (and 1.1) tags in .mp3 files."
2010-01-19 14:05:40 -08:00
Tom O'Neill
3c07d53599
Merge "Find out whether we should mention behavior specific to our own provider"
2010-01-19 13:54:00 -08:00
Romain Guy
eb3854cb76
Merge "Make sure the drawing cache is invalidated when reattaching a view. Bug #2373677 "
2010-01-19 13:29:03 -08:00
Andreas Huber
083becb715
Merge "Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process."
2010-01-19 11:43:12 -08:00
Doug Kwan
8f5d80e263
Merge "Add missing libjpeg in linker option. Currently this library is used by the main executable but is included implicitly via inter-library dependency."
2010-01-19 11:42:15 -08:00
James Dong
488b3ced7f
Merge "Media server death nodification"
2010-01-19 11:37:55 -08:00
San Mehat
b3125d8468
Merge "framework: Introduce INetworkManagementService for communicating with netd"
2010-01-19 11:21:44 -08:00
Mike Lockwood
084e7c4ee8
Merge "LocationManagerService: Fix bug removing proximity alerts."
2010-01-19 11:03:19 -08:00
Andreas Huber
e0d029dfe5
Merge "Squashed commit of the following:"
2010-01-19 10:51:33 -08:00
Andreas Huber
b928563093
Merge "Remove totally unused code from OMX.cpp"
2010-01-19 10:50:54 -08:00
Bjorn Bringert
65316a1901
Merge "Fix WEB_SEARCH handler whitelist"
2010-01-19 10:47:30 -08:00
Andreas Huber
5a05fa1575
Merge "Upgrade for the stagefright commandline tool to support extracting thumbnails and to optionally prefer software codecs."
2010-01-19 10:25:13 -08:00
Andreas Huber
577fa59f00
Merge "Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong."
2010-01-19 10:24:58 -08:00
Bjorn Bringert
46b6bc7c21
Merge "Make SearchManager.getGlobalSearchActivity() public but hidden"
2010-01-19 00:58:39 -08:00
Xavier Ducrohet
2a5636e3fc
am 1da2735c: am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclair
...
Merge commit '1da2735c5862d48712706c2052a34e10e3dea43b'
* commit '1da2735c5862d48712706c2052a34e10e3dea43b':
ADT/Layoutlib: implement Canvas.concat(Matrix)
2010-01-19 00:02:15 -08:00
Adam Powell
a0a7b07365
am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair
...
Merge commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee'
* commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee':
TransformGestureDetector is now ScaleGestureDetector - scope reduced.
2010-01-19 00:02:00 -08:00
Xavier Ducrohet
fd1a7126a8
am cff6c845: am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory
...
Merge commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c'
* commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c':
ADT/Layoutlib: Reimplement parts of BitmapFactory
2010-01-19 00:01:32 -08:00
Grace Kloba
aa09eba872
am f167c4bf: DO NOT MERGE
...
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp
* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
DO NOT MERGE
2010-01-18 23:43:37 -08:00
Grace Kloba
fb5587efa1
am 17b14bd3: DO NOT MERGE
...
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp
* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
DO NOT MERGE
2010-01-18 23:43:32 -08:00
Grace Kloba
b8d4b14257
am 5a0bf1f0: DO NOT MERGE
...
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp
* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
DO NOT MERGE
2010-01-18 23:43:27 -08:00
Grace Kloba
7bd3a10bca
am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
...
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp
* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
If ZoomButttonsController detects more than one pointer,
2010-01-18 23:43:20 -08:00
Grace Kloba
12813fd3b7
am f080a5ad: Merge "DO NOT MERGE" into eclair
...
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp
* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
DO NOT MERGE
2010-01-18 23:43:14 -08:00
Jim Miller
3665ec2e86
am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
...
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp
* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
2010-01-18 23:43:01 -08:00
Xavier Ducrohet
cdbcb8441a
am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
...
Merge commit '908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp
* commit '908a81119061092468067789acbec9b99d79ad5f':
ADT/Layoutlib: Add dash support to stroke.
2010-01-18 23:42:55 -08:00
Xavier Ducrohet
7dbb68e405
am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair
...
Merge commit '2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp
* commit '2b30a4a50e24080fdd8b796e4a64447f223d4522':
ADT/Layoutlib: properly handle stroke information.
2010-01-18 23:42:28 -08:00
Grace Kloba
90f5995ffd
Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
2010-01-18 15:21:38 -08:00
Grace Kloba
d0e837b13a
Merge "DO NOT MERGE" into eclair
2010-01-18 15:21:31 -08:00
San Mehat
49ef2b6c98
Merge "MountService: Add new 'unmountSecureContainer' API call"
2010-01-18 07:14:02 -08:00
Daisuke Miyakawa
00fe42ba50
Merge "Make vCard importer support lower case params."
2010-01-17 15:32:02 -08:00