2732 Commits

Author SHA1 Message Date
Dianne Hackborn
7f13e47620 am 1a904ded: am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb
* commit '1a904dedbb5a15b3e60cac0fab83a3734701aff6':
  New extra for GET_CONTENT.
2011-01-25 16:19:48 -08:00
Jeff Hamilton
f0b7977f68 am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
  Fix the build, proper current.xml.
2011-01-25 16:15:58 -08:00
Nick Pelly
30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
2011-01-25 16:13:17 -08:00
Jeff Hamilton
978afba57c Fix the build, proper current.xml.
Change-Id: I9b02206042c74fd5c329fe2b70ed2b6b91d41382
2011-01-25 18:10:58 -06:00
Jeff Hamilton
437ff39c74 resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
2011-01-25 18:00:41 -06:00
Dianne Hackborn
1a904dedbb am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb
* commit '8fca2eccb03b9b8d71ec4a7ec088d617edec4e73':
  New extra for GET_CONTENT.
2011-01-25 15:19:17 -08:00
Dianne Hackborn
c4d0e6fcea New extra for GET_CONTENT.
Change-Id: Ib367c02619ee301d9651dd70d35f7d57aa8a0cbc
2011-01-25 15:16:55 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
2011-01-25 14:41:55 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
2011-01-25 16:32:26 -06:00
Vasu Nori
4d724546e4 Merge "add extra prams to intent to start Download App in sort-by-size mode" 2011-01-25 12:50:27 -08:00
Jeff Hamilton
4f1b04ac47 resolved conflicts for merge of 0aea1836 to honeycomb-merge
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
2011-01-25 14:35:55 -06:00
Vasu Nori
e5f92249f1 add extra prams to intent to start Download App in sort-by-size mode
Change-Id: Icedf50477681bc79582517500748b9a916121903
2011-01-25 11:49:30 -08:00
Nick Pelly
cf1f20e701 am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
  Add operands to mifare classic increment, decrement.
2011-01-25 10:30:11 -08:00
Nick Pelly
fd06cc10ac resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
2011-01-25 10:26:54 -08:00
Nick Pelly
866264fa26 am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
* commit 'bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a':
  Make MifareClassic methods more consistent.
2011-01-25 10:22:41 -08:00
Nick Pelly
bdd265ba5f resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -08:00
Dianne Hackborn
1563966ca0 am 98d169ea: am 5d9d03a0: Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
* commit '98d169eacd65e6278bb8eab354f0278065771e9f':
  Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
2011-01-24 22:31:26 -08:00
Dianne Hackborn
98d169eacd am 5d9d03a0: Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
* commit '5d9d03a0234faa3cffd11502f973057045cafe82':
  Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
2011-01-24 22:12:36 -08:00
Dianne Hackborn
5d9d03a023 Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
...Invalid index 0, size is 0 at
android.app.ActivityThread.performPauseActivity(ActivityThread.java:2326)

It looks like if an arrow key is dispatched between the time the
list view is told its data set has changed and it does the resulting
layout pass, we could try to move the position to a now invalid
index.  This may prevent that from happening.

Also put in a better error message if saving state of a fragment
whose target is no longer in the fragment manager.

And fix a bug in PackageManager where we could return a null from
queryIntentActivities().

And add a new API to find out whether a fragment is being removed,
to help fix issue #3306021: NPE at
android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)

Next, for new HC apps we can delay committing data to
storage until the activity is stopped.

Finally, use the new multi-threaded AyncTask executor in a few
places, so we don't have worked blocked by long-running tasks from
the application.

Change-Id: I27b2aafedf2e1bf3a2316309889613fa539760f3
2011-01-24 21:23:03 -08:00
Andy Stadler
d532ab13dc am 2a9deb0d: am 315fae20: Merge "Throw Base64DataException instead of IOException" into honeycomb
* commit '2a9deb0d40c4c34930a8313074161b846099c7fc':
  Throw Base64DataException instead of IOException
2011-01-24 17:48:23 -08:00
Andy Stadler
2a9deb0d40 am 315fae20: Merge "Throw Base64DataException instead of IOException" into honeycomb
* commit '315fae2028d4ef73c9ba094a71152e6e853e2690':
  Throw Base64DataException instead of IOException
2011-01-24 17:46:33 -08:00
Andy Stadler
c5a0ce242f Throw Base64DataException instead of IOException
* Define Base64DataException
* Throw it from Base64InputStream & Base64OutputStream
* This enables callers to disambiguate "bad data" from "broken stream",
  which makes it more possible to do proper retry logic.

Bug: 3365205
Change-Id: I332e7c008f92b333400d1b4dcaef5aedc7c10ef4
2011-01-24 16:47:56 -08:00
Jeff Hamilton
ff4e6f58d6 am 0ccac6e3: Merge "Merge commit \'446aea40\' into manualmerge" into honeycomb-plus-aosp
* commit '0ccac6e3ee687930d411be69b3bb6904656d128d':
  API changes for NFC.
2011-01-24 14:34:46 -08:00
Jeff Hamilton
b0cae14175 Merge commit '446aea40' into manualmerge
Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
2011-01-24 16:31:38 -06:00
Joe Onorato
b05aacc1ae am ab8967ae: am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb
* commit 'ab8967ae9db71291094da2967e744038b7e91ff7':
  Remove unwanted parameter (it was a typo).
2011-01-24 13:30:42 -08:00
Joe Onorato
10f4126a36 resolved conflicts for merge of faf083ef to master
Change-Id: I316a1b4356f6dba6c3880ccb02dbb2fa00d21a85
2011-01-24 13:16:08 -08:00
Joe Onorato
ab8967ae9d am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb
* commit 'da34e13bb4ef97832c43489937a26d314437a1d7':
  Remove unwanted parameter (it was a typo).
2011-01-24 11:16:43 -08:00
Joe Onorato
e595cad6ee Remove unwanted parameter (it was a typo).
Bug: 3241144
Change-Id: I569f6c8dffb17041a422be6084b6eab89624a57b
2011-01-24 09:25:35 -08:00
Joe Onorato
faf083ef0b am 4c541b13: Merge "visibility ("lights out") API." into honeycomb
* commit '4c541b1303b0ee2b9b0d19bee85d3780c5c4c110':
  visibility ("lights out") API.
2011-01-23 23:36:57 -08:00
Nick Pelly
0065f398c1 am c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread
* commit 'c896d85c15d8a6c98c93df57d88481b89eb878f5':
  Add operands to mifare classic increment, decrement.
2011-01-23 22:14:54 -08:00
Nick Pelly
1e233af3a7 Add operands to mifare classic increment, decrement.
Change-Id: Ib35f615142bda48a5e33888a09ebae2880624788
2011-01-23 22:11:44 -08:00
Nick Pelly
12619677b0 am da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread
* commit 'da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
  Make MifareClassic methods more consistent.
2011-01-23 21:39:39 -08:00
Nick Pelly
e45083b11b Make MifareClassic methods more consistent.
Remove method overloading for combinations of sector+block addressing.
Instead provide methods that more closly match the raw commands, and more
efficient helpers to convert between blocks and sectors.

o fix off-by-one bug in getBlockCountInSector()
o add BLOCK_SIZE
o remove DESFIRE not operating in classic emulation (SAK 0x20)
o hide isEmulated(), there is no use case, and the info is available elsewhere
o getTotalBlockCount() -> getBlockCount()
o getBlockCount(int) -> getBlockCountInSector(int)
o introduce blockToSector() and sectorToBlock()
o remove authenticateBlock()
    make it really clear that authentication is per sector, and reduce function
    explosion. blockToSector() allows you to use authenticateSector...
o explicit authenticateSectorWithKeyA() / authenticateSectorWithKeyB()
    get rid of magic boolean
o remove all (int sector, int block) parameters
    always address by absolute block. this makes the API crystal clear, and
    helps reduce function explosion
o validation of all sector and block indices
o dont & 0xff when converting to byte - its redundant
o Remove TYPE_OTHER. Mifare Classic types are well-known and stable.

Change-Id: I3c9f8254ff307f31b388b3d7592c862d5de6afa5
2011-01-23 21:32:57 -08:00
Joe Onorato
4c541b1303 Merge "visibility ("lights out") API." into honeycomb 2011-01-23 19:26:13 -08:00
Joe Onorato
664644d9e0 visibility ("lights out") API.
1. Views may setSystemUiVisibility() to recommend that
the system chrome (status bar or other UI) show or hide
itself.  (This functionality was previously available only
via the FLAG_FULLSCREEN window flag for some SystemUI
implementations.)

2. Views may register a OnSystemUiVisibilityChangedListener
on a view, and find out when the system UI actually
appears or disappears, allowing apps to coordinate the
appearance of their own UI if desired.

Bug: 3241144
Change-Id: Ia1758d94099182d49a1e3688ea2738ae4995b829
2011-01-23 19:22:52 -08:00
Dianne Hackborn
0a10bab2b9 am 8c92a342: am 9d97b63d: Honeycomb is now officially API 11.
* commit '8c92a3429403a158ce10295131f221e2f683c575':
  Honeycomb is now officially API 11.
2011-01-23 17:00:31 -08:00
Dianne Hackborn
a0d161d07e am 38433e2d: am b4ca900d: Merge "Final (hopefully) API cleanup." into honeycomb
* commit '38433e2dae1dcb8645c9f1b77445513156d88a7c':
  Final (hopefully) API cleanup.
2011-01-23 17:00:01 -08:00
Dianne Hackborn
8c92a34294 am 9d97b63d: Honeycomb is now officially API 11.
* commit '9d97b63d0e0c7c9deb2d140c1dd579b51f52c1af':
  Honeycomb is now officially API 11.
2011-01-23 15:19:09 -08:00
Dianne Hackborn
9d97b63d0e Honeycomb is now officially API 11.
Change-Id: I5b11801468bf6ee2482f1ef201ece70ed9303bd8
2011-01-23 14:56:39 -08:00
Dianne Hackborn
38433e2dae am b4ca900d: Merge "Final (hopefully) API cleanup." into honeycomb
* commit 'b4ca900d139f87547b23ae78a744df68a052e83e':
  Final (hopefully) API cleanup.
2011-01-23 14:50:46 -08:00
Dianne Hackborn
b4ca900d13 Merge "Final (hopefully) API cleanup." into honeycomb 2011-01-23 14:48:09 -08:00
Dianne Hackborn
f3e735c2c3 Final (hopefully) API cleanup.
Change-Id: Iaac6b2ca399eda44458c2bc1a6501672b6c85b90
2011-01-23 14:43:11 -08:00
Dan Morrill
c63ca57a16 am fe7006c5: am 9dbf1351: Merge "Adding faketouch feature." into honeycomb
* commit 'fe7006c5fc6f972aca2a4471ea5cd7db3947e809':
  Adding faketouch feature.
2011-01-23 14:20:42 -08:00
Dan Morrill
fe7006c5fc am 9dbf1351: Merge "Adding faketouch feature." into honeycomb
* commit '9dbf1351e8cd1d8a320cdc7fecffc876fffb71f1':
  Adding faketouch feature.
2011-01-23 14:18:52 -08:00
Dan Morrill
a537687c38 Adding faketouch feature.
Change-Id: Idff0b059c2f82fa4237d6238710e87dc55ae76a8
2011-01-23 13:36:13 -08:00
Vasu Nori
c0e5075739 bug:3048327 (master) ability to add completed download to dnload mgr
Change-Id: I073436c97d5d7cb8ea6a823488a451017dac3ff2
2011-01-22 23:36:50 -08:00
Mike Lockwood
97d7e4c227 Make ACCESS_USB permission for applications to access USB devices:
- change from signatureOrSystem to normal
- no longer associate this permission with the "usb" unix group
- add to public API

Change-Id: I3be3a5d138719dd126ff0a798824a77f9ce79e24
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 15:56:09 -08:00
Mike Lockwood
e7d511e148 New APIs for USB host support:
UsbManager:
- is now a service retrievable via Context.getSystemService(Context.USB_SERVICE).
- provides support for returning a list all connected USB devices
- broadcasts ACTION_USB_DEVICE_ATTACHED and USB_DEVICE_DETACHED when devices
  are added and removed from the USB host bus

UsbDevice:
- represents an attached USB device.

UsbInterface:
- represents an interface on a USB device
- devices may have multiple interfaces if they provide multiple
   sets of functionality (for example, android phones typically have interfaces
   for both USB mass storage and adb)

UsbEndpoint:
- represents an endpoint on a USB interface
- endpoints are used for sending or receiving data
  (only in one or the other direction)

UsbRequest:
- encapsulates a send or receive request to be sent over an endpoint

Change-Id: Ieef3e434c62760770ea839070cf5eba1a705967a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 15:56:09 -08:00
Nick Pelly
a53086c088 am 5cfbda15: resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
* commit '5cfbda15425d078224405950c4be92471279f917':
  Change signature of MifareClassic.authenticate*() to throw IOException.
2011-01-21 16:05:47 -08:00
Nick Pelly
5cfbda1542 resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
2011-01-21 15:30:32 -08:00