Robert Ly
73000f8c44
am 8700547f: am e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb
...
* commit '8700547f5565ae899e7a08271b74b69cc32c3c4f':
doc change: add rel note links to external tools site
2011-02-15 20:15:26 -08:00
Scott Main
ae8a1c635e
am a64507ee: am c918e4a8: docs: add parent links to graphics docs
...
* commit 'a64507eed242b62d8c29dc4e687d61b44ae9a377':
docs: add parent links to graphics docs
2011-02-15 20:15:12 -08:00
Scott Main
55cdc0c904
am 0ab1b326: am 13033ea5: docs: fix misc broken links
...
* commit '0ab1b326c72afb2bd7798462fcdd8e5d3b440fd2':
docs: fix misc broken links
2011-02-15 20:15:00 -08:00
Robert Ly
8700547f55
am e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb
...
* commit 'e250cbb8d5ea787c318bba384fd9cb46b446ea3d':
doc change: add rel note links to external tools site
2011-02-15 20:08:17 -08:00
Scott Main
a64507eed2
am c918e4a8: docs: add parent links to graphics docs
...
* commit 'c918e4a86d42d89cb893b0150358cfd01ef7d532':
docs: add parent links to graphics docs
2011-02-15 20:08:12 -08:00
Scott Main
0ab1b326c7
am 13033ea5: docs: fix misc broken links
...
* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
docs: fix misc broken links
2011-02-15 20:08:07 -08:00
Mathias Agopian
215a0dbe8e
Merge "allow root to call into surfaceflinger"
2011-02-15 19:46:23 -08:00
Mathias Agopian
492277d2e2
allow root to call into surfaceflinger
...
this is useful for running standalone tests
with standalone SurfaceFlinger.
Change-Id: I08d054f6214affa3a777a82765f4e0bd256ba26d
2011-02-15 19:27:47 -08:00
Ken Wakasa
a5e9ffa35c
Fix a bug in canAddToLastInputMethod()
...
bug: 3456057
Change-Id: I977e984aafb36fdb83ac05d19fe0c7324a36d0c5
2011-02-16 11:55:23 +09:00
Elliott Hughes
32c3b81bbc
Merge "Use InetAddress.parseNumericAddress."
2011-02-15 17:42:55 -08:00
Robert Ly
e250cbb8d5
Merge "doc change: add rel note links to external tools site" into honeycomb
2011-02-15 17:38:56 -08:00
Scott Main
c918e4a86d
docs: add parent links to graphics docs
...
Change-Id: I8dafe4c717e9169bf85cdf0594553558827f73ae
2011-02-15 17:37:14 -08:00
Gloria Wang
94f4019994
Merge "Add AAC extractor"
2011-02-15 17:22:01 -08:00
Gloria Wang
c5b0abf900
Add AAC extractor
...
Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
2011-02-15 17:16:22 -08:00
Elliott Hughes
f5bbb57204
Use InetAddress.parseNumericAddress.
...
Bug: 3300307
Change-Id: I4ebfe533056e67931db1117e934596ba7b5c8b75
2011-02-15 17:11:29 -08:00
Robert Ly
a0ef3508dc
doc change: add rel note links to external tools site
...
Change-Id: I5b956db99fa1065699d7fe2322fe00e90c88c724
2011-02-15 16:27:54 -08:00
Jim Miller
9227faf4ea
Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state"
2011-02-15 16:22:08 -08:00
Scott Main
13033ea527
docs: fix misc broken links
...
Change-Id: Id7d0ee36398aca452ceb2c3d15982397f58a06c6
2011-02-15 16:00:37 -08:00
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 e7c83d4a711241923854d6bbd5de0e24f9192f93.
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
Jim Miller
79a444a0cd
Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state
...
Some devices that use LiPo batteries do not charge them to 100%
as a safety margin and to preserve battery longevity. This change
allows KeyguardUpdateMonitor to determine when the battery state should be
reported as "Charged", provided the device sets BATTERY_STATUS_FULL in
that case.
Manual merge of Change-Id: Iac6cb78e24f9a696017459cc773c38ef7fe7779f
Change-Id: I15c316a17108c064bf2c7e657ca908f8767be936
2011-02-15 15:02:11 -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