Robert Greenwalt
d2c21c1518
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
8c166512a7
Merge "Cleanup of process-specific DNS." into eclair
2010-01-20 11:08:13 -08:00
Irfan Sheriff
0fe3f7cbbf
DO NOT MERGE Avoid wifi disable in a UNKNOWN state
...
Multiple broadcast receiver unregister calls cause exception.
Bug: 2361335
2010-01-20 10:08:23 -08:00
Mike Lockwood
47d302a001
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
243bf50e1e
Merge "Create base class for audio policy manager."
2010-01-20 10:03:36 -08:00
Mike Lockwood
bb79e5fdb5
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
2683c6f72c
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
Andreas Huber
c2c9dd3251
Support for 'iTunes-style' metadata in .mp4 and .3gp files.
...
related-to-bug: 2368967
2010-01-20 09:50:32 -08:00
Xavier Ducrohet
3bd6dc6535
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
b44051eee0
Merge "ADT/Layoutlib: implement sweep gradient." into eclair
2010-01-20 09:43:46 -08:00
Makoto Onuki
d738a4d394
Merge "Addign more tests for DomainNameValidator."
2010-01-20 09:22:42 -08:00
Tom O'Neill
89750d395e
Merge "Get rid of a TODO to add documentation for now-hidden columns"
2010-01-20 09:15:14 -08:00
Mike Lockwood
cf1d8cb36f
Be tolerant of GPS session and engine on status messages arriving out of order.
...
BUG: 2366194
Change-Id: I642dacd397202f671adba5a863394438ca62988d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-20 10:20:54 -05:00
Scott Main
382f924c95
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
97b108532f
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
5ed681561c
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
5f64128568
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
Scott Main
5615ca1979
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
Bug:2338253
2010-01-19 19:46:02 -08:00
Xavier Ducrohet
3330927bdd
ADT/Layoutlib: implement sweep gradient.
...
Change-Id: I2d460decff82f5f64b0a5cfeaa68156aad4fb3e6
2010-01-19 18:51:06 -08:00
Robert Greenwalt
15abc90147
Cleanup of process-specific DNS.
...
Backport of MR2 change 421c72b6.
Removes entries sooner. A bug.
Doesn't add one for phone process at all. This was intended to be removed long ago.
bug: 2329900
bug: 2377507
2010-01-19 18:01:36 -08:00
Jason Sams
52a014492c
Merge "Fix RS mipmap generation for 8 bit alpha textures."
2010-01-19 17:54:27 -08:00
Jason Sams
e20e3b41db
Fix RS mipmap generation for 8 bit alpha textures.
2010-01-19 17:53:54 -08:00
Romain Guy
2d51bff2b6
Dpad based scrolling in ListView was mishandling the recycler:
...
recyclable views were removed instead of detached and non-recyclables views
were detached instead of removed.
2010-01-19 17:34:10 -08:00
Romain Guy
5dbe0c753a
Merge "Measure AutoCompleteTextView's dropdown to have enough room for all items. Bug #2363514 "
2010-01-19 16:57:51 -08:00
Romain Guy
73beee234b
Measure AutoCompleteTextView's dropdown to have enough room for all items.
...
Bug #2363514
2010-01-19 16:56:05 -08:00
Joe Onorato
fd24feaf79
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
5910cb53ea
Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
2010-01-19 16:40:17 -08:00
Scott Main
290cd9ab8b
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
f844a5a456
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2010-01-19 16:35:00 -08:00
Joe Onorato
77872f76a1
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
ef5506c817
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
691b47e154
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
28efe25149
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
Adam Powell
380b525220
Edge of screen slop detection for ScaleGestureDetector.
2010-01-19 16:33:46 -08:00
Joe Onorato
c83bb730ec
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.
BUG 1563917
2010-01-19 16:32:22 -08:00
Scott Main
de54a95b98
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
Scott Main
6261d879e7
docs: add a section about debugging web pages with the Console APIs;
...
revise and cleanup some of the other content.
Bug: 2353529
2010-01-19 15:45:59 -08:00
Dianne Hackborn
b1c4a2a3b3
Fix issue #2364506 : Phone locked up while listening to music and attempting to download an update
...
Make sure calls into the notification manager are not done with the
activity manager lock held.
Change-Id: Ib53c3b9f46160d94ee1e7079b1a5123e0d1225d8
2010-01-19 15:36:42 -08:00
Makoto Onuki
691c07031a
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
60e3c09ec0
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
3c05f1fbac
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
6866daee6a
Merge "ADT/Layoutlib: implement radial gradient." into eclair
2010-01-19 14:48:58 -08:00
Tom O'Neill
a351496c60
Get rid of a TODO to add documentation for now-hidden columns
...
Sorry, looks like I forgot to delete it in my previous CL
Change-Id: I46be98f383594654aff5a884e72505878ded3d90
2010-01-19 14:41:01 -08:00
Suchi Amalapurapu
b49d9af7e1
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
56d42582f2
Merge "Fix trailing garbage after UCS-2 encoded strings in ID3 V2."
2010-01-19 14:05:46 -08:00
Andreas Huber
716bda8fd0
Merge "Support for ID3 version 1 (and 1.1) tags in .mp3 files."
2010-01-19 14:05:40 -08:00
Suchi Amalapurapu
fd3530f905
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:04:54 -08:00
Xavier Ducrohet
45a7c28598
ADT/Layoutlib: implement radial gradient.
...
Also refactored some parts of LinearGradient to reuse them
in the radial gradient
Change-Id: I2ec69bd60190bd014217d989177dcc7269188dea
2010-01-19 14:03:31 -08:00
Tom O'Neill
3baf065bc2
Merge "Find out whether we should mention behavior specific to our own provider"
2010-01-19 13:54:00 -08:00
Andreas Huber
5b5ae13e9e
Fix trailing garbage after UCS-2 encoded strings in ID3 V2.
...
related-to-bug: 2381919
2010-01-19 13:52:06 -08:00