Andreas Huber
d22f714973
am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb
...
* commit '0827e697a9965195ca12ba593332c555702aa94a':
Increase cache size and low-watermark threshold, also
2011-01-11 15:22:46 -08:00
Andreas Huber
850e76b426
am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
...
* commit '7f92be88e0d89a693bed4d620a83aea1a989c68e':
Properly parse Matroska lacing flags and extract all frames contained in a block.
2011-01-11 15:22:42 -08:00
Romain Guy
b497fa65a8
am b7968896: Merge "Solve translucency issue when drawing paths." into honeycomb
...
* commit 'b796889671c089fb7e2fc4498aa701d3e8e552a3':
Solve translucency issue when drawing paths.
2011-01-11 15:22:39 -08:00
Andreas Huber
0827e697a9
Merge "Increase cache size and low-watermark threshold, also" into honeycomb
2011-01-11 15:20:39 -08:00
Andreas Huber
7f92be88e0
Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
2011-01-11 15:16:04 -08:00
Andreas Huber
52c7832e35
Increase cache size and low-watermark threshold, also
...
MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).
Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug: 3335220
2011-01-11 15:05:28 -08:00
Romain Guy
b796889671
Merge "Solve translucency issue when drawing paths." into honeycomb
2011-01-11 15:01:02 -08:00
Romain Guy
32228288a9
Solve translucency issue when drawing paths.
...
Change-Id: I68ae0e2ccddaca2f76b5b2dd3e3cf1277fddaad6
2011-01-11 15:02:21 -08:00
Gloria Wang
3b7983cfea
am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."
...
* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
DRM Framework bug fixes.
2011-01-11 14:55:56 -08:00
Scott Main
e15c4e4d63
Merge "resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-11 14:53:52 -08:00
Jaikumar Ganesh
a94aeb3175
am 0c848553: Merge "Update status bar icons for BT reverse tethering." into honeycomb
...
* commit '0c848553346b0f80c7baa0aa08ec1b9d440e442c':
Update status bar icons for BT reverse tethering.
2011-01-11 14:53:21 -08:00
Scott Main
7024a313e4
resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp
...
Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef
2011-01-11 14:51:21 -08:00
Jaikumar Ganesh
0c84855334
Merge "Update status bar icons for BT reverse tethering." into honeycomb
2011-01-11 14:51:01 -08:00
Scott Main
9008121c97
am 246a01b1: am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
...
* commit '246a01b1dedd11e4de4678dedc5cf8eeca922ead':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
2011-01-11 14:22:14 -08:00
Scott Main
7c7912a65c
am f3792055: am c5602aee: fix bug 3295540
...
* commit 'f379205596397500b1a07a72e5693bb81457b2e3':
fix bug 3295540
2011-01-11 14:22:06 -08:00
Yu Shan Emily Lau
513f3ab050
am 5619da8d: am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
...
* commit '5619da8d8b66337db182a016619efa1f31266a78':
Fix the test application orientation. Bug# 3205196
2011-01-11 14:21:59 -08:00
Gilles Debunne
4051ba8cff
am ce77f1b7: (-s ours) am 9ffb0a0d: Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
...
* commit 'ce77f1b7ff24a7c867a8274ffb6388ba2a874441':
Ran fixPngMetaTags on all the core/res assets.
2011-01-11 14:21:51 -08:00
Irfan Sheriff
5fe093cd1f
am 50cf2106: Merge "Fix network availability reporting" into honeycomb
...
* commit '50cf2106b77d4009e1cefe11c57c42fe4584345f':
Fix network availability reporting
2011-01-11 14:17:59 -08:00
Irfan Sheriff
50cf2106b7
Merge "Fix network availability reporting" into honeycomb
2011-01-11 14:16:04 -08:00
Jim Miller
f75286061b
am c82c787c: Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb
...
* commit 'c82c787caa6bf4ef08a81e0a6ed9e12e52f35114':
Update AndroidClock font for LockScreen and tweak transparency.
2011-01-11 14:15:55 -08:00
Jim Miller
c82c787caa
Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb
2011-01-11 14:13:37 -08:00
Justin Ho
6632169d84
am 910a347c: Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb
...
* commit '910a347cee738bbd8da4b6386bfe95c0bf0566bf':
Updated btn default states (MDPI) from Gingerbread
2011-01-11 14:07:14 -08:00
Justin Ho
910a347cee
Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb
2011-01-11 14:05:28 -08:00
Huahui Wu
0a8fb4b21a
am 3ee37b12: Merge "b/3331379 reduce ping-to-zoom jitter." into honeycomb
...
* commit '3ee37b12d598d7354fddb698bc6bdefb3b390f64':
b/3331379 reduce ping-to-zoom jitter.
2011-01-11 14:02:46 -08:00
Huahui Wu
3ee37b12d5
Merge "b/3331379 reduce ping-to-zoom jitter." into honeycomb
2011-01-11 13:59:46 -08:00
Justin Ho
5a999e7729
Updated btn default states (MDPI) from Gingerbread
...
Change-Id: I09006ef68d7b17e0a1dde56d24bf90a97cb4069d
2011-01-11 13:58:24 -08:00
Gilles Debunne
6c0694a8de
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-01-11 13:54:03 -08:00
Gilles Debunne
bf1f63dd3d
am f9335c1f: (-s ours) am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread
...
* commit 'f9335c1f23270b0b0d2649f6a95fe7f4cc0422ee':
Asset cleanup. DO NOT MERGE
2011-01-11 13:53:43 -08:00
Marco Nelissen
9356e6093e
am 2888208b: am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
...
* commit '2888208b0bb38ac93bb6b500992869c8a6bf244c':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
2011-01-11 13:53:34 -08:00
Justin Ho
9e635ec7f8
am 2706a1f8: Merge "Updated permission bullet" into honeycomb
...
* commit '2706a1f8f60f21bc9b483a93a4b694e60bc68888':
Updated permission bullet
2011-01-11 13:53:33 -08:00
Justin Ho
631b089086
am 69c3f8c6: Merge "Updated Help icon" into honeycomb
...
* commit '69c3f8c6720fd320dd7c8ebf2182b02d7d6d9586':
Updated Help icon
2011-01-11 13:53:27 -08:00
Dianne Hackborn
2a17b9c1dc
am aab969ec: am 3c902a62: Merge "Avoiding cyclic references when unbinding from a service"
...
* commit 'aab969ec2baff1f2bcd1d002e9e06e385df5af74':
Avoiding cyclic references when unbinding from a service
2011-01-11 13:53:22 -08:00
Marco Nelissen
f61caad0b8
am d1da80a4: am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
...
* commit 'd1da80a4b3d50c1be120b0e873363da711428a81':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
2011-01-11 13:53:11 -08:00
Nick Pelly
9667f4d435
am 240cf3d1: am f54ad8da: Clean up transceive().
...
* commit '240cf3d17e40c012eb4a830d60f4a6a3607373f0':
Clean up transceive().
2011-01-11 13:53:01 -08:00
Eric Fischer
95c2802126
am 247cd64c: (-s ours) am 06d19ef0: Merge "Import translations for additional languages." into gingerbread
...
* commit '247cd64c37c8ec1fa48848fd23f02f5c705268e4':
Import translations for additional languages.
2011-01-11 13:52:52 -08:00
Justin Ho
2706a1f8f6
Merge "Updated permission bullet" into honeycomb
2011-01-11 13:51:33 -08:00
Justin Ho
69c3f8c672
Merge "Updated Help icon" into honeycomb
2011-01-11 13:51:00 -08:00
Justin Ho
26df73aee5
Updated permission bullet
...
Change-Id: Idbfb5dcb17b29cd47e0fd65d23bf920f68b9b271
2011-01-11 13:49:48 -08:00
Xavier Ducrohet
9fbf9642a0
am 2d83400e: Merge "LayoutLib: Improve error reporting." into honeycomb
...
* commit '2d83400e59f939a25c471d87dbdc7a50ce7f2a44':
LayoutLib: Improve error reporting.
2011-01-11 13:33:05 -08:00
Xavier Ducrohet
df80e5a46b
am 9137e54b: Merge "LayoutLib: fix XmlUtils.convertValueToInt" into honeycomb
...
* commit '9137e54bd462bfb814c8b8b73f20827e1ba5799b':
LayoutLib: fix XmlUtils.convertValueToInt
2011-01-11 13:33:01 -08:00
Xavier Ducrohet
2d83400e59
Merge "LayoutLib: Improve error reporting." into honeycomb
2011-01-11 13:31:19 -08:00
Xavier Ducrohet
9137e54bd4
Merge "LayoutLib: fix XmlUtils.convertValueToInt" into honeycomb
2011-01-11 13:31:05 -08:00
Xavier Ducrohet
a224038d1d
am b2893591: Merge "LayoutLib: only support animator-type animations." into honeycomb
...
* commit 'b289359170bc957aad14d65f725e9b6ef18a42f4':
LayoutLib: only support animator-type animations.
2011-01-11 13:24:52 -08:00
Xavier Ducrohet
b289359170
Merge "LayoutLib: only support animator-type animations." into honeycomb
2011-01-11 13:22:19 -08:00
Xavier Ducrohet
6c740cf71e
LayoutLib: Improve error reporting.
...
Change-Id: I37cad7e2efb959202960c57b271c55c759867139
2011-01-11 13:21:57 -08:00
Chet Haase
0eef63d8c8
am d8650114: All animator resources moved to res/animator
...
* commit 'd865011473aae8dcddc4a8a1350c46d6aed4079a':
All animator resources moved to res/animator
2011-01-11 13:18:47 -08:00
Andreas Huber
6fe6b4c6f3
Properly parse Matroska lacing flags and extract all frames contained in a block.
...
Change-Id: I1aca46b2e28b9cad88bf4a296f675e81e66ee095
related-to-bug: 3331623
2011-01-11 13:05:36 -08:00
Chet Haase
d865011473
All animator resources moved to res/animator
...
Change-Id: I9342ff21e9a15ba29da946e091343a6f8223c181
2011-01-11 12:50:24 -08:00
Leon Scroggins
4709b69bb1
am 9fafe4e0: Merge "Find when pressing enter. Call onClickListener in TextView." into honeycomb
...
* commit '9fafe4e0ebab270591a505f1f07fd2e5489a16f7':
Find when pressing enter. Call onClickListener in TextView.
2011-01-11 12:43:20 -08:00
Leon Scroggins
9fafe4e0eb
Merge "Find when pressing enter. Call onClickListener in TextView." into honeycomb
2011-01-11 12:41:52 -08:00