2325 Commits

Author SHA1 Message Date
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
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
bdd265ba5f resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -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
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
b0cae14175 Merge commit '446aea40' into manualmerge
Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
2011-01-24 16:31:38 -06: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
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
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
Nick Pelly
5cfbda1542 resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
2011-01-21 15:30:32 -08:00
Michael Kolb
b2b830774f am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
  Add public API for on screen zoom controls
2011-01-21 14:49:30 -08:00
Michael Kolb
5840cd294a Add public API for on screen zoom controls
http://b/issue?id=3378224
    This is a simple unhide.
    Allow the use of WebView pinch-to-zoom gestures
    without the on screen zoom controls.
    Currently, enabling pinch to zoom with the public API also shows the
    on screen zoom buttons.
    If the zoom buttons are not wanted, a custom implementation of pinch to
    zoom is required, which can't be done correctly at this point.

Change-Id: I3f94080471c3a4b498b11c91603fff9994dc3c2c
2011-01-21 14:15:16 -08:00
Nick Pelly
8bb36dbbf3 resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
2011-01-21 14:01:54 -08:00
Jeff Hamilton
446aea40eb API changes for NFC.
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
2011-01-21 12:33:49 -08:00
Jeff Hamilton
4e21e1d21a API changes for NFC.
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
2011-01-21 13:32:58 -06:00
Gilles Debunne
34aa51b8f9 am 4569f1a5: Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
* commit '4569f1a561b4db77cc87f649e04c352415b65605':
  Paste popup window is displayed on the side when it would be clipped on top of screen.
2011-01-21 11:32:30 -08:00
Gilles Debunne
e60e1e597b Paste popup window is displayed on the side when it would be clipped on top of screen.
Bug 3259774

Change-Id: I6ea20452a3a235e264c91c112f52da7230657708
2011-01-21 10:34:43 -08:00
Nick Pelly
11ce84fcaa resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350
2011-01-21 09:41:40 -08:00
Nick Pelly
8f912d1202 resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"
Conflicts:
	api/current.xml

Change-Id: Ib6556fa54f49d4b55719dae79662d54f1530e76e
2011-01-21 08:55:38 -08:00
Adam Cohen
f95a963e73 am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb
* commit 'cdd5626da62cb2dc013cded470e264232617f635':
  Cleaning up some StackView bad behavior
2011-01-20 21:42:45 -08:00
Adam Powell
b6b4711648 am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
* commit '9a161b0981ad41169d006186979b7648a2acfd56':
  SearchView API Review - bug 3370353 and bug 3370338
2011-01-20 21:42:31 -08:00
Adam Cohen
cdd5626da6 Merge "Cleaning up some StackView bad behavior" into honeycomb 2011-01-20 19:42:23 -08:00
Adam Powell
9a161b0981 Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb 2011-01-20 18:44:32 -08:00
Stephen Hines
536f525ddb am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
* commit '47171a7b65d841ed27940bb961f7934770c69440':
  Properly use Long2 for "UInt2" for FieldPacker.
2011-01-20 18:31:39 -08:00
Adam Powell
01f2135465 SearchView API Review - bug 3370353 and bug 3370338
Renaming as per API council review

Change-Id: Id889be5a708fdc295ee50bb1b05014b2ff72122c
2011-01-20 18:30:10 -08:00
Stephen Hines
47171a7b65 Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb 2011-01-20 18:27:43 -08:00
Dianne Hackborn
19fdccfdf8 am 11576102: Fix issue #3373438: Update GBMR versions
* commit '11576102a9794ef964a08bc372dc09803f58997a':
  Fix issue #3373438: Update GBMR versions
2011-01-20 18:18:32 -08:00
Stephen Hines
e9f5c1894b Properly use Long2 for "UInt2" for FieldPacker.
We were misusing this API, since it requires the additional precision of
the next size up on unsigned versions of types.

Change-Id: Ic3c87f681ac6705ae0b36a3464ce0d63737945fd
2011-01-20 18:17:25 -08:00
Adam Cohen
ef17dd497e Cleaning up some StackView bad behavior
-> Issue: 3363564, 3320865

Change-Id: I32215478006a689f543532af4ce2267ccbb7fa56
2011-01-20 17:36:27 -08:00
Adam Powell
8bbec79447 am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb
* commit '9c91c7e27fbfff5abc34e19779a9477239ab9b10':
  Fix bug 3362375 - API REVIEW: remove unused public 'up' id
2011-01-20 17:06:35 -08:00
Adam Powell
1264c33163 Fix bug 3362375 - API REVIEW: remove unused public 'up' id
Fix bug 3362453 - API REVIEW: android.app.ActionBar

Change-Id: I4e0233cd9355a47682bfe7b4a7fda39801586f1a
2011-01-20 13:25:08 -08:00
Dianne Hackborn
11576102a9 Fix issue #3373438: Update GBMR versions
Change-Id: Ic4b4f1b0534fd2fbd6322eae01a4cb9d5a67cc6f
2011-01-20 12:16:43 -08:00
Svetoslav Ganov
f008667e6d am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb
* commit '1ec1fdfce959069f3092c15d27efc1c2286dc15c':
  API REVIEW: android.widget.NumberPicker.OnValueChangedListener
2011-01-20 11:04:27 -08:00
Svetoslav Ganov
cedc446684 API REVIEW: android.widget.NumberPicker.OnValueChangedListener
Change-Id: I1e739553ab6b99b2768e42cf379a0b155dced81a
2011-01-20 10:41:14 -08:00