Andreas Huber
23bfa7f36f
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)""
2011-02-15 15:56:20 -08:00
Scott Main
ebcf0ae513
am 40534523: am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
...
* commit '40534523304784fdc46f0de28fcaad9d3df2821b':
docs: add 'new' tags and resolve some doc title regressions
2011-02-15 15:52:25 -08:00
Scott Main
4053452330
am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
...
* commit 'a460a9ac79bb79c2a410401a907a6bdf21320746':
docs: add 'new' tags and resolve some doc title regressions
2011-02-15 15:49:43 -08:00
Robert Ly
8e2cd027f8
am 090662bd: am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
...
* commit '090662bdfc90c5f8925f554efd6ece12730a98dd':
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-15 15:47:56 -08:00
Scott Main
a460a9ac79
docs: add 'new' tags and resolve some doc title regressions
...
Change-Id: I4894d29dded74e4e47cdff6e816417de776cfe04
2011-02-15 15:45:55 -08:00
Robert Ly
090662bdfc
am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
...
* commit 'c00cc5f22689e0c6dba50b6bf8dc085ffca20d39':
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-15 15:42:14 -08:00
Andreas Huber
7ff893979a
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
...
This reverts commit e7c83d4a71 .
Change-Id: I5151c7c72d79154528c55aa01bf006c8e38e7af7
2011-02-15 15:34:34 -08:00
Fabrice Di Meglio
2fa160840c
Merge "Small optimization when getting the spans"
2011-02-15 15:28:50 -08:00
Daisuke Miyakawa
d81958e0fc
Merge "Fix typo."
2011-02-15 15:21:09 -08:00
Robert Ly
c00cc5f226
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
...
Doc change: nfc dev guide
Change-Id: I918d0eddc51a96adf901170a6b2f6cbd38579d1d
2011-02-15 15:20:57 -08:00
Adam Powell
99c4032fb3
Merge "Fix bug 3362273 - Make overscroll glow appear within padding region"
2011-02-15 15:07:55 -08:00
Adam Powell
7d86378b0c
Fix bug 3362273 - Make overscroll glow appear within padding region
...
Change-Id: I3c6513ada6bdd192c83f3ff59a2c85717156de22
2011-02-15 15:05:03 -08:00
Fabrice Di Meglio
a2a035ef47
Small optimization when getting the spans
...
- loop earlier if the kind is not the one we want
Change-Id: I5b020f20a144678ad2f7a4bca8fef64eb6ae491f
2011-02-15 14:31:26 -08:00
Robert Greenwalt
a04ee9fa7e
Merge "Remove some unused wifi dhcp code."
2011-02-15 14:26:37 -08:00
Andreas Huber
f040d7dfc5
Merge "Derive the Transport "source" attribute from the RTSP endpoint address if necessary"
2011-02-15 14:12:56 -08:00
Robert Greenwalt
19f8ca846b
Remove some unused wifi dhcp code.
...
Change-Id: I114b3772b334a41936c6ed4bb8304f6914481ef1
2011-02-15 13:50:21 -08:00
Andreas Huber
27db53de35
Derive the Transport "source" attribute from the RTSP endpoint address if necessary
...
and continue even if we were unable to poke a hole into the firewall.
related-to-bug: 3457201
Change-Id: I0a523f38e6959bf00b8b140a70bb65fcc414c9c1
2011-02-15 13:49:32 -08:00
Andreas Huber
284ff954f0
Merge "Work around several issues with non-compliant RTSP servers."
2011-02-15 13:31:14 -08:00
Daisuke Miyakawa
5c40f3fcc9
Fix typo.
...
Change-Id: I32bbe182d51d5fe0289c8939fbadb57336ddd98a
2011-02-15 13:24:36 -08:00
Amith Yamasani
5101e1ed51
Merge "Don't change keyboard state in setIconifiedByDefault."
2011-02-15 13:06:20 -08:00
John Wang
c5b82a8328
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-02-15 12:43:05 -08:00
John Wang
fc2bb2fbc7
am d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
...
* commit 'd0789ec99593bf556c88ff866a81d23449df1911':
Only decode EXT1 tag when it is available.
2011-02-15 12:43:00 -08:00
Mike Lockwood
9ba9f26dc1
Merge "MTP host: disable some test code"
2011-02-15 12:42:58 -08:00
John Wang
d0789ec995
am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
...
* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
Only decode EXT1 tag when it is available.
2011-02-15 12:40:49 -08:00
John Wang
3901402600
am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
...
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
Only decode EXT1 tag when it is available.
2011-02-15 12:38:38 -08:00
Joe Malin
c330289c19
am 80dcc6ae: am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
...
* commit '80dcc6aebfbca724f49c83d30cdad51ef980f0db':
SDK docs: Hierarchy Viewer V2
2011-02-15 12:37:36 -08:00
Mathias Agopian
f27ebdeb39
Merge "fix [3452769] SensorEventListener can cause a java allocation at each received event [external]"
2011-02-15 12:34:48 -08:00
John Wang
29853a356b
Merge "Only decode EXT1 tag when it is available." into gingerbread
2011-02-15 12:34:37 -08:00
Joe Malin
80dcc6aebf
am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
...
* commit '6d1387b6ecf0aaea6f36472fcd1a499824fd30b5':
SDK docs: Hierarchy Viewer V2
2011-02-15 12:34:35 -08:00
Joe Malin
6d1387b6ec
Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
2011-02-15 12:32:48 -08:00
Amith Yamasani
1b64c3b5fe
Don't change keyboard state in setIconifiedByDefault.
...
Bug: 3225887
Bug: 3453253 (possibly)
Since some apps call setIconifiedByDefault(false) at the initialization step,
it isn't a good idea to open/close the keyboard during this call. Apps
can call setIconified(false) instead to invoke the keyboard.
Change-Id: I9d5d08b74055a3e99053d647df0cd4c7953bae80
2011-02-15 12:02:45 -08:00
Andreas Huber
0407269ae3
Work around several issues with non-compliant RTSP servers.
...
In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.
They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...
Change-Id: I63fa90ca2398f19e8b52c147248bd2c5c2372426
related-to-bug: 3452103
2011-02-15 12:00:07 -08:00
Mike Lockwood
8c553b9003
MTP host: disable some test code
...
Change-Id: I2237ad88f73b03a2c324f17267c52cc42b8a0d5b
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-02-15 14:55:51 -05:00
Andreas Huber
f2599ba788
am ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
...
* commit 'ad1831a56fd60779464326468ee1d471a10f71a0':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
2011-02-15 11:53:47 -08:00
Shimeng (Simon) Wang
a94e0c8651
Merge "Keep overview mode when screen is rotated."
2011-02-15 11:52:16 -08:00
Andreas Huber
ad1831a56f
am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
...
* commit 'e0c9f2757b0ebd291fec89ebb520878aacd3f7dc':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
2011-02-15 11:51:33 -08:00
Andreas Huber
e0c9f2757b
am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
...
* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
2011-02-15 11:49:03 -08:00
Scott Main
d3b6abc466
am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb
...
* commit '2b0c6fdfff0faf17163d126ac21c1651e4053968':
docs: revise a couple sample app names to match side nav
2011-02-15 11:38:50 -08:00
Scott Main
2b0c6fdfff
am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb
...
* commit '97ef3b416ada559c446d1d21d70d2604433b92f5':
docs: revise a couple sample app names to match side nav
2011-02-15 11:36:44 -08:00
Scott Main
97ef3b416a
Merge "docs: revise a couple sample app names to match side nav" into honeycomb
2011-02-15 11:33:43 -08:00
Adam Powell
5fd8dd01a7
Merge "Fix some bugs with MenuPopupHelper and ListPopupWindow"
2011-02-15 11:16:01 -08:00
Shimeng (Simon) Wang
a5b3d807a1
Keep overview mode when screen is rotated.
...
issue: 3385613
Change-Id: I49ba8dbdfe72adb1df5e453d7c95ec107e0d3e75
2011-02-15 11:14:57 -08:00
Scott Main
1e7131eac2
am 9b833cf0: am 5a44efb4: docs: fix markup error
...
* commit '9b833cf0cb499f2fe66319f9773f88fb94a85709':
docs: fix markup error
2011-02-15 11:09:19 -08:00
Scott Main
9b833cf0cb
am 5a44efb4: docs: fix markup error
...
* commit '5a44efb42738e4fd1b448004f74dc96372801936':
docs: fix markup error
2011-02-15 11:07:06 -08:00
Andreas Huber
d1ba051a46
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
...
In this particular case these RTSP servers were implemented as local services,
retransmitting live streams via a local RTSP server instance.
They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session
description, wrong case of the format description, relative base URLs...
Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325
related-to-bug: 3452103
2011-02-15 11:02:43 -08:00
Scott Main
d873e660c5
docs: revise a couple sample app names to match side nav
...
Change-Id: Ia45e78fe005c80934d70b585558cb4c6c0f52f30
2011-02-15 10:58:34 -08:00
Scott Main
5a44efb427
docs: fix markup error
...
Change-Id: Ic4f86094bbebaca7f9be37207a4126d083fff575
2011-02-15 10:45:46 -08:00
Gilles Debunne
05cc6dbf70
Merge "Text insertion cursor is now defined by a Drawable."
2011-02-15 10:41:30 -08:00
Shimeng (Simon) Wang
0a20767f61
Merge "Keep mobile site's text wrap scale unchanged."
2011-02-15 10:12:29 -08:00
Chet Haase
6b5e593725
Merge "Fix when >2 keyframes supplied"
2011-02-15 06:46:48 -08:00