OSDN Git Service
Kristian Monsen [Thu, 17 Feb 2011 16:47:41 +0000 (08:47 -0800)]
Merge "Updated from comments to previous change after submitting"
Jeff Brown [Thu, 17 Feb 2011 04:00:21 +0000 (20:00 -0800)]
Merge "Add support for arbitrary axes in MotionEvents."
Irfan Sheriff [Thu, 17 Feb 2011 02:18:10 +0000 (18:18 -0800)]
Merge "Make high performance wifi lock public"
Jesse Wilson [Thu, 17 Feb 2011 01:57:09 +0000 (17:57 -0800)]
Merge "Expose an API to get a bitmap's size in bytes."
Jesse Wilson [Wed, 16 Feb 2011 23:46:12 +0000 (15:46 -0800)]
Expose an API to get a bitmap's size in bytes.
Change-Id: I960c3b02b1ba8d3a8d92aaa98955a159e6f3a228
http://b/
3184897
Jim Miller [Thu, 17 Feb 2011 01:49:17 +0000 (17:49 -0800)]
Merge "Fix
3197205: Minor edits to device policy admin strings and documentation"
Adam Cohen [Thu, 17 Feb 2011 01:12:25 +0000 (17:12 -0800)]
Merge "StackView rendering fix for non-hardware accelerated apps and hardware layers"
Chet Haase [Thu, 17 Feb 2011 01:05:06 +0000 (17:05 -0800)]
Merge "Fix invalidation bug with View bounds properties"
Adam Powell [Thu, 17 Feb 2011 00:56:44 +0000 (16:56 -0800)]
Merge "Fix bug
3413800 - Revise AutoCompleteTextView dropdown behavior"
Adam Powell [Thu, 17 Feb 2011 00:49:50 +0000 (16:49 -0800)]
Fix bug
3413800 - Revise AutoCompleteTextView dropdown behavior
Be more conservative with when we let an AutoCompleteTextView's
dropdown box of completion suggestions cover the IME.
Disable the expand-when-touched behavior of the dropdown list when
more than 3 items can be seen at a time without it.
Don't let a ListPopupWindow that is expanding in response to touch
scroll the anchor view within its parent and slide the dropdown out
from under the user's finger.
Change-Id: I009accfd4e841c9a5e1072735d8a0b067a0bc06a
John Reck [Thu, 17 Feb 2011 00:51:46 +0000 (16:51 -0800)]
Merge "Add missing resources"
John Reck [Thu, 17 Feb 2011 00:41:04 +0000 (16:41 -0800)]
Add missing resources
Bug:
3463011
Change-Id: Ie312c72bf7315cddfef12118de11bcfa634e73dc
Alon Albert [Thu, 17 Feb 2011 00:39:47 +0000 (16:39 -0800)]
Merge "Rename method to discourage use of this in favor of member field"
Chet Haase [Thu, 17 Feb 2011 00:23:29 +0000 (16:23 -0800)]
Fix invalidation bug with View bounds properties
When setLeft/Right/Top/Bottom() functions were called on View,
invalidation was only happening at the parent level. When an
app is hardware accelerated, this means that the view's display
list is not being recreated. So views that were changing size due
to these calls were not getting redrawn properly, causing some
artifacts in animations (especially LayoutTransition, which
calls these setters).
Fix is to invalidate the child instead of just the child's bounds
in the parent.
Change-Id: Ic8b2a5db519345dce617f914c2214738f22031b2
Jim Miller [Thu, 17 Feb 2011 00:27:41 +0000 (16:27 -0800)]
Fix
3197205: Minor edits to device policy admin strings and documentation
Change-Id: I3788772c375b916752cd8a98ff5d3751448e4334
Mathias Agopian [Wed, 16 Feb 2011 23:43:17 +0000 (15:43 -0800)]
Merge "fix a surface leak in SurfaceFlinger"
Mathias Agopian [Wed, 16 Feb 2011 03:01:06 +0000 (19:01 -0800)]
fix a surface leak in SurfaceFlinger
SF kept a strong reference to ISurface until the
window manager removed the surface from the screen.
This fell appart when running standalone tests, that is
when the window manager wasn't involved.
When the window manager is around, it would clean-up surfaces
even when an application died.
with this change, SF is able to do its own cleanup without
relying on the window manager.
the change is very simple, we simply don't keep a reference
to ISurface and make sure no more than one of them can
be created.
Change-Id: I61f2d7473bf8d4aa651549a846c34cdbb0d0c85a
Jeff Brown [Wed, 16 Feb 2011 23:30:54 +0000 (15:30 -0800)]
Merge "Scale major axis when finger is oriented."
Teng-Hui Zhu [Wed, 16 Feb 2011 23:13:24 +0000 (15:13 -0800)]
Merge "Adding a debug setting to enable visual indicator for GL"
Brian Muramatsu [Wed, 16 Feb 2011 23:08:45 +0000 (15:08 -0800)]
Merge "Fix Paint#breakText(char[]..) JavaDoc"
John Reck [Wed, 16 Feb 2011 23:05:04 +0000 (15:05 -0800)]
Merge "Adds localization support for incognito start page"
Brian Muramatsu [Wed, 16 Feb 2011 19:40:06 +0000 (11:40 -0800)]
Fix Paint#breakText(char[]..) JavaDoc
The JavaDoc says that if the "...count is negative then the
characters before index are measured in reverse order. This
allows for measuring the end of string."
However, the native code doesn't work its way backwards
from the given index when the count is negative. It always
passes Skia the substring starting from index and the
absolute value of count.
Its better to fix the JavaDoc rather than the behavior, since
this API is public and has been this way for some time. It
is also used by TextUtils.ellipsize indirectly, so its best
to avoid breaking that sensitive code.
Change-Id: I8bd51def6ec98251e355370710eb44f58fb737c4
Basavapatna Dattaguru [Wed, 16 Feb 2011 22:54:08 +0000 (14:54 -0800)]
Merge "VideoEditor:Issue ID:
3431967"
John Reck [Wed, 16 Feb 2011 22:21:21 +0000 (14:21 -0800)]
Adds localization support for incognito start page
Bug:
3460867
This change has BrowserFrame intercept browser:incognito URLs to
provide a localized version of them. It also adds a spanish
translation for the page.
Change-Id: I888453d895ea1047544a09ba7f23645e2746bea6
Teng-Hui Zhu [Wed, 16 Feb 2011 19:25:03 +0000 (11:25 -0800)]
Adding a debug setting to enable visual indicator for GL
[This is the WebView part]
The idea is to turn on the visual indicator without building the code.
The implementation included:
1. Setup the UI on browser side to check whether or not this is enabled.
2. Transfer the info from browser setting to web setting.
3. Send this info down from WebView to webkit.
4. In the webkit, we save this info in TilesManager.
5. At texture generation time, we query this info to decide whether or
not add the visual indicator on the texture.
One design decision we made is we don't want to restart the browser for
debugging purpose. This is better preserving the browser current activity,
the only pitfall is that the visual indicator is NOT updated on different
textures simultaneously.
The corresponding browser change is: #change,97058
The dependent webkit change is: #change,97052
bug:
3458721
Change-Id: I34a0514048df61b414c3386b292f2586efbde74e
Andreas Huber [Wed, 16 Feb 2011 22:31:27 +0000 (14:31 -0800)]
am
09b18c2f: (-s ours) am
79a97489: (-s ours) am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
09b18c2f1d5ca6cf25352ae633f2121556a516ab':
DO NOT MERGE: Respond to RTSP server->client requests.
Basavapatna Dattaguru [Wed, 16 Feb 2011 05:54:48 +0000 (21:54 -0800)]
VideoEditor:Issue ID:
3431967
Fixes memory leak in getProperties
Updated with Review comments
Change-Id: Ie4e8edaee1c76f18d0526b5eae9f9a128e0a3c17
Irfan Sheriff [Wed, 16 Feb 2011 20:13:59 +0000 (12:13 -0800)]
Make high performance wifi lock public
gtalk and sip already use the high perf lock. Improve
the comments and make the constant public.
This will allow applications that use voice or video
to keep the connection good even when device screen
is off
Change-Id: I3608cd478175c773bd835b26a686a61b8baf5471
Andreas Huber [Wed, 16 Feb 2011 22:28:01 +0000 (14:28 -0800)]
am
79a97489: (-s ours) am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
79a97489494deb8bdae85696f612ec7acda54240':
DO NOT MERGE: Respond to RTSP server->client requests.
Andreas Huber [Wed, 16 Feb 2011 22:24:53 +0000 (14:24 -0800)]
am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
Adam Cohen [Wed, 16 Feb 2011 22:04:09 +0000 (14:04 -0800)]
StackView rendering fix for non-hardware accelerated apps and hardware layers
Change-Id: I34a0362cd37c6b95a0b3196302b6510b0f7ad34e
Andreas Huber [Wed, 16 Feb 2011 21:20:02 +0000 (13:20 -0800)]
DO NOT MERGE: Respond to RTSP server->client requests.
Even if it's just to tell them that we don't support any (this is optional).
Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug:
3353752
Andreas Huber [Wed, 16 Feb 2011 21:27:02 +0000 (13:27 -0800)]
Merge "Respond to RTSP server->client requests."
Andreas Huber [Wed, 16 Feb 2011 21:20:02 +0000 (13:20 -0800)]
Respond to RTSP server->client requests.
Even if it's just to tell them that we don't support any (this is optional).
Change-Id: I557865ac00d0fb65ffa69363eb1eceaabe522a1a
related-to-bug:
3353752
Irfan Sheriff [Wed, 16 Feb 2011 21:17:54 +0000 (13:17 -0800)]
Merge "Fix wifi watchdog to use InetAddress"
Dmitri Plotnikov [Wed, 16 Feb 2011 21:15:15 +0000 (13:15 -0800)]
Merge "Setting copiedSize to 0 when value is null"
Brian Carlstrom [Wed, 16 Feb 2011 20:56:36 +0000 (12:56 -0800)]
Merge "Deprecate non-X509Certificate SslCertificate constructors"
Shimeng (Simon) Wang [Wed, 16 Feb 2011 20:55:47 +0000 (12:55 -0800)]
Merge "Remember zoom overview state since the postscale callback is async."
Brian Carlstrom [Wed, 16 Feb 2011 19:40:15 +0000 (11:40 -0800)]
Deprecate non-X509Certificate SslCertificate constructors
Change-Id: I45541c48b321fbd6054712c08d8ac64108d32674
Scott Main [Wed, 16 Feb 2011 20:45:34 +0000 (12:45 -0800)]
am
869f1f3e: am
0643d7c4: docs: add new tag for tasks doc
* commit '
869f1f3e9024d66c57bc30d3afb821074a9139f7':
docs: add new tag for tasks doc
Mike Lockwood [Wed, 16 Feb 2011 20:42:35 +0000 (12:42 -0800)]
Merge "UsbManager: New APIs for USB accessories"
Scott Main [Wed, 16 Feb 2011 20:41:53 +0000 (12:41 -0800)]
am
0643d7c4: docs: add new tag for tasks doc
* commit '
0643d7c442f975efa35c9e3729d74555627a32b5':
docs: add new tag for tasks doc
Scott Main [Wed, 16 Feb 2011 20:38:59 +0000 (12:38 -0800)]
docs: add new tag for tasks doc
Change-Id: I60248fb9ec1d98e89b526391c453d1bde9226cb0
Kenny Root [Wed, 16 Feb 2011 20:33:28 +0000 (12:33 -0800)]
Merge "Clean up use of HAVE_ANDROID_OS"
James Dong [Wed, 16 Feb 2011 20:27:08 +0000 (12:27 -0800)]
Merge "Change the media player stress test to repor the total number of failure and the total number of info. Register the surface callback in the test application bug#
2909064"
Yu Shan Emily Lau [Wed, 16 Feb 2011 00:45:08 +0000 (16:45 -0800)]
Change the media player stress test to repor the total number of failure and the total number of info.
Register the surface callback in the test application bug#
2909064
Change-Id: I3420b5bc81e276b50f612c126ed5fc1f4f16c08c
Andy Stadler [Wed, 16 Feb 2011 20:22:57 +0000 (12:22 -0800)]
am
04ddff69: am
b1835085: Merge "@hide DPM global proxy settings" into honeycomb
* commit '
04ddff6905a72d0d39d791eaba33546fb66b15a6':
@hide DPM global proxy settings
Andy Stadler [Wed, 16 Feb 2011 20:20:36 +0000 (12:20 -0800)]
am
b1835085: Merge "@hide DPM global proxy settings" into honeycomb
* commit '
b18350851633b1d3717f2484d27b76aa64788ce1':
@hide DPM global proxy settings
Andy Stadler [Wed, 16 Feb 2011 20:18:39 +0000 (12:18 -0800)]
Merge "@hide DPM global proxy settings" into honeycomb
Scott Main [Wed, 16 Feb 2011 20:11:11 +0000 (12:11 -0800)]
am
153cebee: resolved conflicts for merge of
f722cecd to honeycomb-plus-aosp
* commit '
153cebee2432a931773130bffa20e72a982c0107':
docs: update homepage for 3.0 announcement
Scott Main [Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)]
resolved conflicts for merge of
f722cecd to honeycomb-plus-aosp
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
Dmitri Plotnikov [Wed, 16 Feb 2011 20:03:10 +0000 (12:03 -0800)]
Setting copiedSize to 0 when value is null
Bug:
3457998
Change-Id: I01f6d02e76884639600c679518c5817ce73e0f23
Scott Main [Wed, 16 Feb 2011 19:58:40 +0000 (11:58 -0800)]
Merge "docs: update homepage for 3.0 announcement" into honeycomb
Daniel Sandler [Wed, 16 Feb 2011 19:32:39 +0000 (11:32 -0800)]
Merge "Fix NPE."
James Dong [Tue, 15 Feb 2011 18:08:07 +0000 (10:08 -0800)]
Decouple AudioRecord read and audio encoding
bug -
3313754
Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
Robert Greenwalt [Wed, 16 Feb 2011 18:58:34 +0000 (10:58 -0800)]
am
271397cf: (-s ours) am
de27b519: (-s ours) am
3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '
271397cfb2b79d1346568209b37b1f57707f924a':
DO NOT MERGE - backport of l92a02b31 from master
Kenny Root [Wed, 16 Feb 2011 18:13:53 +0000 (10:13 -0800)]
Clean up use of HAVE_ANDROID_OS
HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches
all the other uses of HAVE_ANDROID_OS throughout the system.
Change-Id: I82257325a8ae5e4e4371ddfc4dbf51cea8ea0abb
Robert Greenwalt [Wed, 16 Feb 2011 18:55:54 +0000 (10:55 -0800)]
am
de27b519: (-s ours) am
3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '
de27b519588ed46c0ba601a489c01d26ec31757d':
DO NOT MERGE - backport of l92a02b31 from master
Andy Stadler [Wed, 16 Feb 2011 18:53:33 +0000 (10:53 -0800)]
@hide DPM global proxy settings
They don't work as advertised, so remove from SDK.
Bug:
3460938
Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
Robert Greenwalt [Wed, 16 Feb 2011 18:51:04 +0000 (10:51 -0800)]
am
3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '
3259d8853760a72b811757e1711119d041962a1c':
DO NOT MERGE - backport of l92a02b31 from master
Fabrice Di Meglio [Wed, 16 Feb 2011 18:48:12 +0000 (10:48 -0800)]
Merge "Code cleaning"
Robert Greenwalt [Wed, 16 Feb 2011 18:44:26 +0000 (10:44 -0800)]
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Eric Fischer [Wed, 16 Feb 2011 18:41:59 +0000 (10:41 -0800)]
am
aebe3dfe: (-s ours) am
874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
aebe3dfe61ba889962174cf9e24783770af31e02':
Import revised translations. DO NOT MERGE
Shimeng (Simon) Wang [Wed, 16 Feb 2011 18:31:16 +0000 (10:31 -0800)]
Remember zoom overview state since the postscale callback is async.
issue:
3451476
Change-Id: I56eaeff4e35f8a791b990fcdd1188ca6cdef601a
Eric Fischer [Wed, 16 Feb 2011 18:38:11 +0000 (10:38 -0800)]
am
874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Wed, 16 Feb 2011 18:37:50 +0000 (10:37 -0800)]
Fix wifi watchdog to use InetAddress
Supports IPv6 and stops using deprectated DhcpInfo.
Change-Id: I0590dbcd50f56e15d9b95327ad9435cdbfc8a78d
Eric Fischer [Wed, 16 Feb 2011 18:33:18 +0000 (10:33 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Alon Albert [Wed, 16 Feb 2011 18:29:56 +0000 (10:29 -0800)]
Rename method to discourage use of this in favor of member field
Change-Id: Ie2d1e17e8879ad0f11fe815001fefccdd6603936
Alon Albert [Wed, 16 Feb 2011 18:28:51 +0000 (10:28 -0800)]
am
2d314d12: (-s ours) am
b79db4cd: (-s ours) am
be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit '
2d314d1282067518bcd34015f629c5d3e6ff15a1':
DO NOT MERGE - Clear backoffs on reconnect
Alon Albert [Wed, 16 Feb 2011 18:26:53 +0000 (10:26 -0800)]
am
b79db4cd: (-s ours) am
be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit '
b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
DO NOT MERGE - Clear backoffs on reconnect
Scott Main [Wed, 16 Feb 2011 18:25:29 +0000 (10:25 -0800)]
am
415ef50d: am
796ce77a: docs: add breadcrumbs to articles and tutorials
* commit '
415ef50d902dddfe974f3a280733ae3769931143':
docs: add breadcrumbs to articles and tutorials
Alon Albert [Wed, 16 Feb 2011 18:24:15 +0000 (10:24 -0800)]
am
be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit '
be5f82ab0ddacea3846cfa5aa846d1c97def0318':
DO NOT MERGE - Clear backoffs on reconnect
Scott Main [Wed, 16 Feb 2011 18:23:05 +0000 (10:23 -0800)]
am
796ce77a: docs: add breadcrumbs to articles and tutorials
* commit '
796ce77abf3d1d006576490c286e72ebf0736280':
docs: add breadcrumbs to articles and tutorials
Alon Albert [Wed, 16 Feb 2011 18:20:40 +0000 (10:20 -0800)]
Merge "Bring back auto clear backoff on reconnect Also, make sure it works this time by calling onBackoffChanged()"
Alon Albert [Wed, 16 Feb 2011 18:20:13 +0000 (10:20 -0800)]
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
Eric Fischer [Wed, 16 Feb 2011 18:18:37 +0000 (10:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Id7d999bfc9d422292aa81d5a8c579840e9cc1438
Alon Albert [Tue, 15 Feb 2011 22:02:14 +0000 (14:02 -0800)]
Bring back auto clear backoff on reconnect
Also, make sure it works this time by calling onBackoffChanged()
Bug:
3460736
Change-Id: I0470d6cb0aabd798dab4116d5d135c7a2364ed28
Alon Albert [Tue, 15 Feb 2011 23:07:59 +0000 (15:07 -0800)]
DO NOT MERGE - Clear backoffs on reconnect
Slightly modified backport from HC
Bug:
3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
Andreas Huber [Wed, 16 Feb 2011 18:12:11 +0000 (10:12 -0800)]
Merge "Remove legacy, AwesomePlayer-based http live implementation."
Scott Main [Wed, 16 Feb 2011 18:04:45 +0000 (10:04 -0800)]
docs: add breadcrumbs to articles and tutorials
Change-Id: If49368853e95d39bbe6b42c6fc3820a8a7319048
daniel_tomas [Wed, 16 Feb 2011 17:45:41 +0000 (09:45 -0800)]
am
54f9be2a: am
99e267eb: am
7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '
54f9be2a265a0e06bb7f6c50acf674f47b8fe18a':
New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:43:08 +0000 (09:43 -0800)]
am
99e267eb: am
7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '
99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:41:00 +0000 (09:41 -0800)]
am
7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '
7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
New API added in NfcAdapter to enable/disable SE card emulation
Shimeng (Simon) Wang [Wed, 16 Feb 2011 17:28:16 +0000 (09:28 -0800)]
Merge "Fit to screen for the first new picture with enough different width."
Nick Pelly [Wed, 16 Feb 2011 17:27:37 +0000 (09:27 -0800)]
daniel_tomas [Thu, 6 Jan 2011 23:44:10 +0000 (15:44 -0800)]
New API added in NfcAdapter to enable/disable SE card emulation
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
Scott Main [Wed, 16 Feb 2011 17:25:29 +0000 (09:25 -0800)]
am
9fb2b136: am
f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
* commit '
9fb2b13600a7192031d37cd41525eacb736bcf11':
docs: edit doc titles to match side nav and add breadcrumb links
Nick Pelly [Wed, 16 Feb 2011 17:25:09 +0000 (09:25 -0800)]
am
8c8e9d9a: am
1df862a4: Minor doc update.
* commit '
8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
Minor doc update.
Andreas Huber [Wed, 16 Feb 2011 17:23:11 +0000 (09:23 -0800)]
am
0bbf9667: (-s ours) am
16d94f58: (-s ours) am
8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '
0bbf96675783758b6ffdff8996d7166ae1dec15b':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
Nick Pelly [Wed, 16 Feb 2011 17:23:08 +0000 (09:23 -0800)]
am
1df862a4: Minor doc update.
* commit '
1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
Scott Main [Wed, 16 Feb 2011 17:21:06 +0000 (09:21 -0800)]
am
f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
* commit '
f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
docs: edit doc titles to match side nav and add breadcrumb links
Andreas Huber [Wed, 16 Feb 2011 17:05:38 +0000 (09:05 -0800)]
Remove legacy, AwesomePlayer-based http live implementation.
Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
Nick Pelly [Tue, 15 Feb 2011 21:34:38 +0000 (13:34 -0800)]
Minor doc update.
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
Andreas Huber [Wed, 16 Feb 2011 17:10:19 +0000 (09:10 -0800)]
am
16d94f58: (-s ours) am
8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '
16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
Scott Main [Wed, 16 Feb 2011 17:06:43 +0000 (09:06 -0800)]
Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
Andreas Huber [Wed, 16 Feb 2011 17:02:08 +0000 (09:02 -0800)]
am
8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '
8db7a7bfadc7bdfa30f60bb06063f91b19234096':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
Andreas Huber [Wed, 16 Feb 2011 16:50:37 +0000 (08:50 -0800)]
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
Mike Lockwood [Tue, 15 Feb 2011 14:50:22 +0000 (09:50 -0500)]
UsbManager: New APIs for USB accessories
USB accessories are peripherals that connect to android devices as a USB host.
When connected, the accessory will first identify itself to the android device
by sending manufacturer, product, accessory type and version strings
to the device, and then request the device to enter USB accessory mode.
The device will then enable the USB accessory kernel driver and disable
all other USB functionality except possibly adb
(adb can be used while the android device is connected to the PC
and the PC is running software that emulates a USB accessory)
The class android.hardware.UsbAccessory is used to describe the
currently attached USB accessory.
UsbAccessory contains the manufacturer, product, accessory type
and version strings to identify the accessory.
The accessory can be opened as a ParcelFileDescriptor, which can be used
to communicate with the accessory over two bulk endpoints.
The Intents UsbManager.USB_ACCESSORY_ATTACHED and
UsbManager.USB_ACCESSORY_DETACHED are broadcast when accessories are
connected and disconnected to the device. The USB_ACCESSORY_ATTACHED
contains a UsbAccessory object for the attached accessory as an extra.
The Intent also contains string extras for the manufacturer, product,
accessory type and version strings to allow filtering on these strings.
Change-Id: Ie77cbf51814a4aa44a6b1e62673bfe4c6aa81755
Signed-off-by: Mike Lockwood <lockwood@android.com>
Kristian Monsen [Wed, 16 Feb 2011 10:59:56 +0000 (10:59 +0000)]
Updated from comments to previous change after submitting
Previous change:
https://android-git.corp.google.com/g/#change,91471
This change was to fix bug
3270236
Change-Id: I7dc3179a55420d3383647e2bd50d4766dd21231b
Robert Ly [Wed, 16 Feb 2011 07:01:37 +0000 (23:01 -0800)]
am
e131ccb6: am
c3ebf27a: am
4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
* commit '
e131ccb615172e317501f721c30b152823c566bf':
Adding package summary for nfc.tech package