drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,310 Commits 1 Branch 0 Tags
Commit Graph

45310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
da9a17019e am aebe3dfe: (-s ours) am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'aebe3dfe61ba889962174cf9e24783770af31e02':
  Import revised translations.  DO NOT MERGE
 2011-02-16 10:41:59 -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
Robert Greenwalt
8e9abc5b2e Fix wifi watchdog to use InetAddress 
Supports IPv6 and stops using deprectated DhcpInfo.

Change-Id: I0590dbcd50f56e15d9b95327ad9435cdbfc8a78d
 2011-02-16 10:37:50 -08:00
Eric Fischer
874ae43ce1 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-16 10:33:18 -08:00
Alon Albert
1bad83adf0 Rename method to discourage use of this in favor of member field 
Change-Id: Ie2d1e17e8879ad0f11fe815001fefccdd6603936
 2011-02-16 10:29:56 -08:00
Alon Albert
4308735055 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
 2011-02-16 10:28:51 -08:00
Alon Albert
2d314d1282 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
 2011-02-16 10:26:53 -08:00
Scott Main
739b35fff4 am 415ef50d: am 796ce77a: docs: add breadcrumbs to articles and tutorials 
* commit '415ef50d902dddfe974f3a280733ae3769931143':
  docs: add breadcrumbs to articles and tutorials
 2011-02-16 10:25:29 -08:00
Alon Albert
b79db4cd5c am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:24:15 -08:00
Scott Main
415ef50d90 am 796ce77a: docs: add breadcrumbs to articles and tutorials 
* commit '796ce77abf3d1d006576490c286e72ebf0736280':
  docs: add breadcrumbs to articles and tutorials
 2011-02-16 10:23:05 -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
Alon Albert
be5f82ab0d Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -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
Alon Albert
c441e4e355 DO NOT MERGE - Clear backoffs on reconnect 
Slightly modified backport from HC

Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
 2011-02-16 10:16:33 -08:00
Andreas Huber
9497144281 Merge "Remove legacy, AwesomePlayer-based http live implementation." 2011-02-16 10:12:11 -08:00
Scott Main
796ce77abf docs: add breadcrumbs to articles and tutorials 
Change-Id: If49368853e95d39bbe6b42c6fc3820a8a7319048
 2011-02-16 10:04:45 -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
Scott Main
3e98093c59 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
 2011-02-16 09:25:29 -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
Andreas Huber
65e53c664f 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
 2011-02-16 09:23:11 -08:00
Nick Pelly
8c8e9d9a7f am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Scott Main
9fb2b13600 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
 2011-02-16 09:21:06 -08:00
Andreas Huber
d6c421f1a0 Remove legacy, AwesomePlayer-based http live implementation. 
Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
 2011-02-16 09:19:40 -08:00
Nick Pelly
1df862a465 Minor doc update. 
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
 2011-02-16 09:18:34 -08:00
Andreas Huber
0bbf966757 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
 2011-02-16 09:10:19 -08:00
Scott Main
f79bbc305b Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb 2011-02-16 09:06:43 -08:00
Andreas Huber
16d94f580a 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
 2011-02-16 09:02:08 -08:00
Andreas Huber
8db7a7bfad Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 2011-02-16 08:50:37 -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
512474b0cd am a925a3ca: am 9cf2fa02: docs: add breadcrumbs to developing docs 
* commit 'a925a3ca1f0aed3aeebfd8eff569d5238ccf8213':
  docs: add breadcrumbs to developing docs
 2011-02-15 20:15:50 -08:00
Scott Main
4a010eeb89 am c35d0ee1: am a766a8be: docs: add breadcrumbs to testing docs 
* commit 'c35d0ee105a80ed4f3c749a9f12a23adc7791ddb':
  docs: add breadcrumbs to testing docs
 2011-02-15 20:15:36 -08:00
Scott Main
e502c7c0ca am f0b4f100: am f2d52938: Merge "docs: revise loader doc title" into honeycomb 
* commit 'f0b4f1007935a724cd0cfa64520ac98ee68a2266':
  docs: revise loader doc title
 2011-02-15 20:15:31 -08:00
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
Scott Main
a925a3ca1f am 9cf2fa02: docs: add breadcrumbs to developing docs 
* commit '9cf2fa023bb55979853995a34a9fa9996a2212f0':
  docs: add breadcrumbs to developing docs
 2011-02-15 20:08:30 -08:00
Scott Main
c35d0ee105 am a766a8be: docs: add breadcrumbs to testing docs 
* commit 'a766a8bee24b46fdeea2cc891e6ce202d906245f':
  docs: add breadcrumbs to testing docs
 2011-02-15 20:08:26 -08:00
Scott Main
f0b4f10079 am f2d52938: Merge "docs: revise loader doc title" into honeycomb 
* commit 'f2d5293844a3c782ccd415d327007ec5e7681a26':
  docs: revise loader doc title
 2011-02-15 20:08:21 -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