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
Robert Greenwalt
a1b99a24b6
am 8c166512: Merge "Cleanup of process-specific DNS." into eclair
...
Merge commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b' into eclair-plus-aosp
* commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b':
Cleanup of process-specific DNS.
2010-01-20 11:12:40 -08:00
Robert Greenwalt
9110cdd7b7
Merge "Cleanup of process-specific DNS." into eclair
2010-01-20 11:08:13 -08:00
Mike Lockwood
3e83c05431
am bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
...
Merge commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867' into eclair-plus-aosp
* commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867':
Be tolerant of GPS session and engine on status messages arriving out of order.
2010-01-20 10:04:13 -08:00
Eric Laurent
f05b4a481d
Merge "Create base class for audio policy manager."
2010-01-20 10:03:36 -08:00
Mike Lockwood
7b06197d8a
Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
2010-01-20 10:00:55 -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
Xavier Ducrohet
a2ec9a5dc4
am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
...
Merge commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp
* commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678':
ADT/Layoutlib: implement sweep gradient.
2010-01-20 09:47:06 -08:00
Xavier Ducrohet
5820b33a50
Merge "ADT/Layoutlib: implement sweep gradient." into eclair
2010-01-20 09:43:46 -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
Scott Main
a314601e3b
am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file
...
Merge commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp
* commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5':
docs: a lot of revision and expansion of the hello view tutorials
2010-01-19 19:59:24 -08:00
Adam Powell
2175e4029f
am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
...
Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp
* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
Edge of screen slop detection for ScaleGestureDetector.
2010-01-19 19:59:19 -08:00
Scott Main
2ffff1b1d2
am de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
...
Merge commit 'de54a95b98b9d80c10ca2788b83386094222cb4f' into eclair-plus-aosp
* commit 'de54a95b98b9d80c10ca2788b83386094222cb4f':
docs: add a section about debugging web pages with the Console APIs;
2010-01-19 19:59:13 -08:00
Dianne Hackborn
f1f6ff3f1f
am b1c4a2a3: Fix issue #2364506 : Phone locked up while listening to music and attempting to download an update
...
Merge commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7' into eclair-plus-aosp
* commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7':
Fix issue #2364506 : Phone locked up while listening to music and attempting to download an update
2010-01-19 19:59:04 -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
Adam Powell
e35804e8d7
Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
2010-01-19 16:40:17 -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
Scott Main
044e2017f7
Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
2010-01-19 16:18:52 -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
Xavier Ducrohet
529b74655a
am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair
...
Merge commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0' into eclair-plus-aosp
* commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0':
ADT/Layoutlib: implement radial gradient.
2010-01-19 14:53:52 -08:00
Ying Wang
1415f6c8c3
am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair
...
Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp
* commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
Add instrumentation as a source tag for proguard keep options.
2010-01-19 14:53:47 -08:00
Xavier Ducrohet
299694ac75
Merge "ADT/Layoutlib: implement radial gradient." into eclair
2010-01-19 14:48:58 -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
Ying Wang
6580f62ee6
Merge "Add instrumentation as a source tag for proguard keep options." into eclair
2010-01-19 11:55:12 -08:00
Guang Zhu
1c2e6b87a5
am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
...
Merge commit 'ccec75e7a842f8ba26617406768206eb3be32222' into eclair-plus-aosp
* commit 'ccec75e7a842f8ba26617406768206eb3be32222':
Prevent orientation change from triggering activity recreation.
2010-01-19 11:54:05 -08:00
Amith Yamasani
93cf0e8c11
am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
...
Merge commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp
* commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
Security fix in accessibility - don't read out password. # 2371557
2010-01-19 11:53:59 -08:00
Guang Zhu
173f7caae8
Merge "Prevent orientation change from triggering activity recreation." into eclair
2010-01-19 11:53:00 -08:00
Amith Yamasani
cf7d227365
Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair
2010-01-19 11:50:39 -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
Scott Main
e5f817d984
am 88e653f6: Merge "docs: some spelling typos" into eclair
...
Merge commit '88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp
* commit '88e653f6653aeb237631681f6700f0e572779617':
docs: some spelling typos
2010-01-19 11:21:58 -08:00
San Mehat
b3125d8468
Merge "framework: Introduce INetworkManagementService for communicating with netd"
2010-01-19 11:21:44 -08:00
Scott Main
1808876147
Merge "docs: some spelling typos" into eclair
2010-01-19 11:18:39 -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