Dmitri Plotnikov
06f992c6b0
Merge "Setting copiedSize to 0 when value is null"
2011-02-16 13:15:15 -08:00
Brian Carlstrom
7343bb5f1d
Merge "Deprecate non-X509Certificate SslCertificate constructors"
2011-02-16 12:56:36 -08:00
Shimeng (Simon) Wang
44c3109055
Merge "Remember zoom overview state since the postscale callback is async."
2011-02-16 12:55:47 -08:00
Brian Carlstrom
cc687c52a0
Deprecate non-X509Certificate SslCertificate constructors
...
Change-Id: I45541c48b321fbd6054712c08d8ac64108d32674
2011-02-16 12:50:56 -08:00
Mike Lockwood
984dd8a206
Merge "UsbManager: New APIs for USB accessories"
2011-02-16 12:42:35 -08:00
Andy Stadler
b84133740a
am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
...
* commit '04ddff6905a72d0d39d791eaba33546fb66b15a6':
@hide DPM global proxy settings
2011-02-16 12:22:57 -08:00
Andy Stadler
04ddff6905
am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
...
* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
@hide DPM global proxy settings
2011-02-16 12:20:36 -08:00
Andy Stadler
b183508516
Merge "@hide DPM global proxy settings" into honeycomb
2011-02-16 12:18:39 -08:00
Dmitri Plotnikov
9480efeff7
Setting copiedSize to 0 when value is null
...
Bug: 3457998
Change-Id: I01f6d02e76884639600c679518c5817ce73e0f23
2011-02-16 12:03:10 -08:00
Andy Stadler
d26727273d
@hide DPM global proxy settings
...
They don't work as advertised, so remove from SDK.
Bug: 3460938
Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
2011-02-16 10:53:33 -08:00
Fabrice Di Meglio
8761bfaa8d
Merge "Code cleaning"
2011-02-16 10:48:12 -08:00
Shimeng (Simon) Wang
96b065f001
Remember zoom overview state since the postscale callback is async.
...
issue: 3451476
Change-Id: I56eaeff4e35f8a791b990fcdd1188ca6cdef601a
2011-02-16 10:38:21 -08:00
Eric Fischer
aebe3dfe61
am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
Import revised translations. DO NOT MERGE
2011-02-16 10:38:11 -08:00
Alon Albert
d1c3fe022e
Merge "Bring back auto clear backoff on reconnect Also, make sure it works this time by calling onBackoffChanged()"
2011-02-16 10:20:40 -08:00
Eric Fischer
abe92da72f
Import revised translations. DO NOT MERGE
...
Change-Id: Id7d999bfc9d422292aa81d5a8c579840e9cc1438
2011-02-16 10:18:37 -08:00
Alon Albert
ed1d253573
Bring back auto clear backoff on reconnect
...
Also, make sure it works this time by calling onBackoffChanged()
Bug: 3460736
Change-Id: I0470d6cb0aabd798dab4116d5d135c7a2364ed28
2011-02-16 10:17:49 -08:00
daniel_tomas
675a6527a5
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
2011-02-16 09:45:41 -08:00
daniel_tomas
54f9be2a26
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
2011-02-16 09:43:08 -08:00
daniel_tomas
99e267ebcf
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
2011-02-16 09:41:00 -08:00
Shimeng (Simon) Wang
0f7c903aa1
Merge "Fit to screen for the first new picture with enough different width."
2011-02-16 09:28:16 -08:00
Nick Pelly
ef12256ca5
am d8d51fed: am 8c8e9d9a: am 1df862a4: Minor doc update.
...
* commit 'd8d51fed861cd36f57f1eb2542def23322379d7c':
Minor doc update.
2011-02-16 09:27:37 -08:00
daniel_tomas
7bcd2c62eb
New API added in NfcAdapter to enable/disable SE card emulation
...
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
2011-02-16 09:27:25 -08:00
Nick Pelly
d8d51fed86
am 8c8e9d9a: am 1df862a4: Minor doc update.
...
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
Minor doc update.
2011-02-16 09:25:09 -08:00
Nick Pelly
8c8e9d9a7f
am 1df862a4: Minor doc update.
...
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465
Minor doc update.
...
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
2011-02-16 09:18:34 -08:00
Mike Lockwood
9182d3c4eb
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>
2011-02-16 08:25:16 -05:00
Robert Ly
b424227509
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
2011-02-15 23:01:37 -08:00
Robert Ly
e131ccb615
am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
...
* commit 'c3ebf27a511934d7529b2fbde223169e83c74561':
Adding package summary for nfc.tech package
2011-02-15 22:58:51 -08:00
Robert Ly
c3ebf27a51
am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
...
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
Adding package summary for nfc.tech package
2011-02-15 22:54:52 -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
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
Shimeng (Simon) Wang
7c6aaf062b
Fit to screen for the first new picture with enough different width.
...
This is to fix cases where the content width is keep changing due to
animation, such as 2011 google io site.
issue: 3451476
Change-Id: I8b1ba27a34e37a18116131ecc60391975ef75788
2011-02-15 18:08:30 -08:00
Elliott Hughes
32c3b81bbc
Merge "Use InetAddress.parseNumericAddress."
2011-02-15 17:42:55 -08:00
Robert Ly
2deeefeb5e
Adding package summary for nfc.tech package
...
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
2011-02-15 17:41:47 -08:00
Fabrice Di Meglio
121c82c813
Code cleaning
...
- remove unused local variables
- add char constants
- some variables renaming to be more understandable
Change-Id: Id54dd671b1449cca6463bf77160dc72c8bf0c805
2011-02-15 17:41:10 -08:00
Elliott Hughes
f5bbb57204
Use InetAddress.parseNumericAddress.
...
Bug: 3300307
Change-Id: I4ebfe533056e67931db1117e934596ba7b5c8b75
2011-02-15 17:11:29 -08:00
Scott Main
13033ea527
docs: fix misc broken links
...
Change-Id: Id7d0ee36398aca452ceb2c3d15982397f58a06c6
2011-02-15 16:00:37 -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
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
Robert Greenwalt
19f8ca846b
Remove some unused wifi dhcp code.
...
Change-Id: I114b3772b334a41936c6ed4bb8304f6914481ef1
2011-02-15 13:50:21 -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
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
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
Shimeng (Simon) Wang
a94e0c8651
Merge "Keep overview mode when screen is rotated."
2011-02-15 11:52:16 -08:00
Adam Powell
5fd8dd01a7
Merge "Fix some bugs with MenuPopupHelper and ListPopupWindow"
2011-02-15 11:16:01 -08:00