Paul Westbrook
7d9549172a
Bug 2330111
...
Make NumberPicker public
Made setCurrent() more robust, as the value needs to be within the range
specified earlier. setCurrent() will now throw an exception
if the specified doesn't fall in the range
2010-01-21 16:56:57 -08:00
Doug Zongker
a2fe2f39d9
Merge "relocate GoogleLoginService"
2010-01-21 16:10:58 -08:00
Wink Saville
0693d08bd4
Merge "Fix build, GsmServiceStateTracker was using old EventLog API."
2010-01-21 15:00:12 -08:00
Grace Kloba
834081811a
am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair
...
Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0'
* commit '88196464e91dd533f2dd28a02f55b7e4801eead0':
DO NOT MERGE
2010-01-21 14:32:01 -08:00
Grace Kloba
01627527e5
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2010-01-21 14:31:45 -08:00
Grace Kloba
5dac46fa33
am c8cab725: (-s ours) am d1019a99: Merge "DO NOT MERGE" into eclair
...
Merge commit 'c8cab72521781091e87049861c4b25fb19197ea4'
* commit 'c8cab72521781091e87049861c4b25fb19197ea4':
DO NOT MERGE
2010-01-21 14:31:33 -08:00
Xavier Ducrohet
e34151d8cd
am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
...
Merge commit '20cc55703348827fbd80ff0410777a537f01e10e'
* commit '20cc55703348827fbd80ff0410777a537f01e10e':
ADT/Layoutlib: improved gradient drawing for perf.
2010-01-21 14:31:11 -08:00
Xavier Ducrohet
4ac4775f3d
am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that.
...
Merge commit '38fa9eee9324b2355f28372e80dba12c1d7cc105'
* commit '38fa9eee9324b2355f28372e80dba12c1d7cc105':
ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
2010-01-21 14:30:48 -08:00
Xavier Ducrohet
1736f2f16a
am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
...
Merge commit '895c92a44b8bcf0aec7066c061293cafe12a76c2'
* commit '895c92a44b8bcf0aec7066c061293cafe12a76c2':
ADT/Layoutlib: always use custom gradient (java) Paint.
2010-01-21 14:30:17 -08:00
Roman Nurik
bc5a9796e3
am b8c564d0: am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
...
Merge commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef'
* commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef':
Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
2010-01-21 14:29:26 -08:00
Xavier Ducrohet
db35a3115c
am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
...
Merge commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1'
* commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1':
ADT/Layout: support for 3+ color in linear gradients
2010-01-21 14:29:02 -08:00
Leon Scroggins
aa774c3e81
Merge "Create a common method for updating the title of a download from the filename."
2010-01-21 13:29:32 -08:00
John Wang
91d3dd13ed
am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair
...
Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'
* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
Add Event log for RAT switch.
2010-01-21 12:47:13 -08:00
Amith Yamasani
3f0f4602b8
Merge "Workaround for a database update callback that claims that the data doesn't exist."
2010-01-21 11:22:01 -08:00
Andreas Huber
c79a720825
Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup."
2010-01-21 10:44:54 -08:00
Andreas Huber
27ed8d59bf
Merge "Special-case .wmv and .wma metadata retrieval and playback to use PV if available."
2010-01-21 10:44:47 -08:00
Vasu Nori
dc11327790
Merge "caching PRAGMA sql statements caused cts-tests failures."
2010-01-21 10:29:22 -08:00
Derek Sollenberger
0cb6ce5f88
am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
...
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'
* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:39:15 -08:00
Derek Sollenberger
224b2a71c0
am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
...
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp
* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:29:33 -08:00
Mike Lockwood
1d42c81cc5
Merge "Implement Notification.DEFAULT_LIGHTS flag."
2010-01-21 08:18:15 -08:00
San Mehat
1db4b8e107
Merge "INetworkManagementService: Add support for enumerating TTYs and attaching ppp servers to them"
2010-01-20 18:15:43 -08:00
San Mehat
3b03d70640
Merge "NativeDaemonConnector: Add a convenience method for obtaining lists"
2010-01-20 18:12:54 -08:00
Andreas Huber
b36043d2de
Merge "Fix no-copy-overhead OMXCodec implementation to actually work."
2010-01-20 16:07:23 -08:00
Vasu Nori
9bc05a6682
Merge "reduce logging noise from cache-full conditions."
2010-01-20 15:41:54 -08:00
Jim Miller
b368c4ad8c
Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen."
2010-01-20 15:12:04 -08:00
Mathias Agopian
8f17896782
Merge "fix [2363362] [Sapphire] Corrupted raw picture displayed during snapshot"
2010-01-20 15:08:33 -08:00
Mathias Agopian
54b2f26d11
Merge "part of fix for [2363362] [Sapphire] Corrupted raw picture displayed during snapshot"
2010-01-20 15:08:27 -08:00
Joe Onorato
058cd973e4
am b3699b14: am 836e1666: Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair
...
Merge commit 'b3699b14be3a3db1d75ea4c38853b0a53d14b1be'
* commit 'b3699b14be3a3db1d75ea4c38853b0a53d14b1be':
add drawSpriteScreenspaceCropped to renderscript
2010-01-20 14:35:52 -08:00
Mathias Agopian
5fdea8d5b0
fix [2363362] [Sapphire] Corrupted raw picture displayed during snapshot
...
handled all cases where the scale factor of a video is out of bounds of
supported scale factors in copybit.
2010-01-20 14:31:53 -08:00
Jacek Surazski
51201cd347
Merge "Add systemApp field to ApplicationErrorReport"
2010-01-20 14:14:12 -08:00
Barry Hayes
bd2406ce98
Merge "Check the boolean value for the arg to ZygoteInit to make sure it's either true or false. Make a slightly more informative usage message. Give developers a slightly easier way to have their preloaded classes list out of sync without blowing up."
2010-01-20 14:11:26 -08:00
Mathias Agopian
ecc99c003b
part of fix for [2363362] [Sapphire] Corrupted raw picture displayed during snapshot
...
make sure to fallback properly to software when copybit operation fails.
with this change, the preview image will at least be displayed in b&w
(since GL doesn't support the yuv format). This would also fix
2363506, but that one is now handled more cleanly.
2010-01-20 14:07:44 -08:00
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