Glenn Kasten
dbc289d6c2
Bug 3438513 Fix incorrect throws clause
...
Change-Id: Ib47c12b2b03b0b03d8df69f1b943839283c9f867
2011-02-09 10:38:39 -08:00
Romain Guy
366a84056c
Expose several useful Bitmap APIs.
...
Bug #3408073
Bitmap.setHasAlpha() in particular is very useful for applications that use
ARGB_8888 bitmaps but want/need to benefit from an extra speed boost.
Change-Id: I73d081b7e43bd725baffd1a9892c72d8729816f7
2011-02-08 11:58:06 -08:00
Jesse Wilson
e2c1f4a0ee
New LRU cache class.
...
Change-Id: I0e6ea1e489c684b876aebd5857c6f16a21048a8d
http://b/3184897
2011-02-07 16:39:35 -08:00
Vasu Nori
1b67231483
am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
...
* commit '9ec496b484305defa6cbb691b85836ace8b73a02':
Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
2011-02-03 18:08:44 -08:00
Marco Nelissen
770d02c2fa
Unhide MediaStore.getVersion so Music2 can use it.
...
Change-Id: I006860fe2bd828ffdc598dc89329eba952fde5b3
2011-02-03 12:23:40 -08:00
Vasu Nori
e1cbd0a85f
Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
...
This reverts commit 6bc710f769618e87b98d51cd02241e6b1a2fb653, reversing
changes made to 7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a.
2011-02-03 12:20:31 -08:00
Mike Lockwood
04f024d564
Merge changes I80558c62,I6587f580
...
* changes:
UsbService: Blacklist HID boot subclass devices (keyboards and mice)
UsbService: Add support for blacklisting certain USB busses
2011-02-03 09:51:06 -08:00
Vasu Nori
b73fb5401e
am 99e8e047: am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
...
* commit '99e8e0470249ce145003cc1eabc5ae391af34a06':
bug:3414192 new API to designate a download to be OTA update
2011-02-02 17:15:16 -08:00
Vasu Nori
72725ebcad
bug:3414192 new API to designate a download to be OTA update
...
Change-Id: Iae2f6185e130324ad956f594e78b1d8b2176c808
2011-02-02 15:08:49 -08:00
Nick Pelly
826da2299a
Reconcile api/11.xml with honeycomb-plus-aosp to fix build.
...
Change-Id: I107094cf0d2972a45e6ef9d7555096cbcd4ebe01
2011-02-01 17:32:46 -08:00
Jean-Baptiste Queru
72f43886fb
Really get the new GB APIs.
...
Change-Id: Ib2bc4d964ad925977ed58e466cc50ed3e89f5924
2011-02-01 15:21:21 -08:00
Mike Lockwood
8b682ad08a
UsbService: Blacklist HID boot subclass devices (keyboards and mice)
...
Change-Id: I80558c6205e041ad730c7815aba97cb80132e820
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-01 15:53:11 -05:00
Nick Pelly
17bf5e3ccf
DO NOT MERGE
...
Cherry-pick from GB to HC, updating 11.xml.
Final final final Gingerbread MR API changes.
This is it. I promise.
ACTION_TECHNOLOGY_DISCOVERED -> ACTION_TECH_DISCOVERED
This was missed in our technology->tech rename.
Hide TagTechnology.reconnect()
This is used to reset any per-connection state in a tag, by reconnecting
to it. The first problem is that it belongs on Tag, not TagTechnology. The
second problem is that it may become redundant once we add Tag.rediscover()
which will also reconnect to the tag, and will also return a new Tag with
newly created technologies enumerated. And the third and most significant
problem is that you can already achieve the same result by just calling
close() followed by connect().
Hide Tag.createMockTag()
This API cannot be used reliably. First it requires using int[] for the
technology list, but those int constants are now hidden. Second it requires
knowledge of the extras parcel used to fill technology specific data - also
not public.
Introduce TagTechnology.isConnected()
Every child class already impelmented this, and given that connect() and
close() are defined on the interface, then isConnected() should be there
too.
Modify Ndef.getType to return a string (not int)
Allows more flexibility in adding new NDEF types. Current public strings are
org.nfcforum.ndef.type1
org.nfcforum.ndef.type2
org.nfcforum.ndef.type3
org.nfcforum.ndef.type4
com.nxp.ndef.mifareclassic
Add NdefFormatable.formatReadOnly()
This allows you to make the tag read-only at the same time as performing
format and write. It is important because we currently don't have any
public API to re-enumerate a tag technology list after making a tag
NDEF compatible, so you can't perform the format as a seperate step
without physically removing the tag from field and returning it.
Modify Readonly -> ReadOnly
Make Tag class final
Change-Id: Ifa8a17741fcc95776ffdba42f611eadb036aaf2d
2011-02-01 11:12:56 -08:00
Jeff Hamilton
7def415195
am 1d04981f: am f7176dfb: am 113834c5: Commit the final API for level 10.
...
* commit '1d04981fb2a484212ddb4ffb599e682ed2a9680d':
Commit the final API for level 10.
2011-01-31 10:14:28 -08:00
Jeff Hamilton
1d04981fb2
am f7176dfb: am 113834c5: Commit the final API for level 10.
...
* commit 'f7176dfbd284f7da49e5bccc2aa886b42039ba4a':
Commit the final API for level 10.
2011-01-31 10:11:46 -08:00
Jeff Hamilton
f7176dfbd2
am 113834c5: Commit the final API for level 10.
...
* commit '113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
2011-01-31 10:05:13 -08:00
Jeff Hamilton
81c31c95c1
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
...
Change-Id: If1d1ff69a6f3e80796d68ec5dbfa722adce23d40
2011-01-31 12:00:35 -06:00
Jeff Hamilton
113834c5ab
Commit the final API for level 10.
...
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
2011-01-31 11:46:29 -06:00
Dianne Hackborn
cc322207cc
am 97510f6a: am 260c3c77: Fix issue #3381489 : IllegalStateException: attempt to re-open...
...
* commit '97510f6abda493119cbf7db84064291a7edacfc0':
Fix issue #3381489 : IllegalStateException: attempt to re-open...
2011-01-30 18:08:12 -08:00
Dianne Hackborn
260c3c77d9
Fix issue #3381489 : IllegalStateException: attempt to re-open...
...
...an already-closed object: android.database.sqlite.SQLiteQuery
It turns out there is a state we are missing -- the loader is
still needed, but in the inactive list. In this case the loader
needs to continue holding on to its current data, and not deliver
any new data (which would result in it releasing its old data).
This introduces the new state to Loader, and uses it in
AsyncTaskLoader so all subclasses of that should get the new
correct behavior.
A further improvement would be to unregister CursorLoader's
content listener when going in to this state, but that can
wait for later.
Change-Id: I6d30173b94f8e30b5be31d018accd328cc3388ec
2011-01-30 17:58:49 -08:00
Dianne Hackborn
58468459dc
am 9e3754ff: am 54ad3611: Merge "Fix issue #3404571 : Commit final APIs" into honeycomb
...
* commit '9e3754ff6dcc81c43708ce0e13c75de836173f64':
Fix issue #3404571 : Commit final APIs
2011-01-30 16:15:13 -08:00
Dianne Hackborn
3b024a6d28
Fix issue #3404571 : Commit final APIs
...
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
2011-01-30 14:26:31 -08:00
The Android Open Source Project
b2abd8c424
Mass merge from gingerbread - do not merge
...
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Jean-Baptiste Queru
0044b4ad6a
Merge d350dc04 from gingerbread
...
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
2011-01-29 10:57:48 -08:00
Jean-Baptiste Queru
0440cc1fb7
Merge eab0e97b from gingerbread
...
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
2011-01-29 10:38:09 -08:00
Jean-Baptiste Queru
962d556a12
Merge f126ad3b from gingerbread
...
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
2011-01-29 09:37:44 -08:00
Jean-Baptiste Queru
52d3320815
am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp
...
* commit 'bf9f3ea72ea3201415acb3bb016de3009d3ed1b3':
API: Make close() throw an IOException.
2011-01-29 08:50:38 -08:00
Jean-Baptiste Queru
bf9f3ea72e
Merge 34afc2cd from gingerbread-plus-aosp
...
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
2011-01-29 08:45:29 -08:00
Jean-Baptiste Queru
8b10bdb494
am 7d4b7dab: Merge 55e124c4 from gingerbread-plus-aosp
...
* commit '7d4b7dab397fb780873303d60650bf0a0557cf41':
Clean up MifareUltralight API.
2011-01-29 07:38:41 -08:00
Jean-Baptiste Queru
7d4b7dab39
Merge 55e124c4 from gingerbread-plus-aosp
...
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
2011-01-29 07:32:39 -08:00
Jean-Baptiste Queru
86e1c5b9f6
Merge c896d85c from gingerbread
...
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6
Merge da01b4ab from gingerbread
...
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
2011-01-29 07:17:22 -08:00
Jeff Hamilton
df5d015ae2
resolved conflicts for merge of dc54a8c7 to honeycomb-merge
...
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
2011-01-28 20:41:42 -06:00
Christopher Tate
9805d8e081
Merge "Enable global (cross-application) drag/drop"
2011-01-28 18:01:56 -08:00
Christopher Tate
251602f410
Enable global (cross-application) drag/drop
...
Also adds a new flag constant, View.DRAG_FLAG_GLOBAL, which indicates that
the drag operation should be allowed to propagate the drag outside the
originating app. When this flag is specified, all visible windows will
be notified about the ongoing drag.
Bug 3322724
Change-Id: Iaa3412a97f83f4e763019c9a03b5f09ebf75453f
2011-01-28 17:54:12 -08:00
Adam Powell
9cbf8d3028
am 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
...
* commit '406de58e48378bca9ea7e75c61039d243ea81855':
Fix bug 3399992 - Make ActionBar menu text styleable
2011-01-28 14:03:31 -08:00
Adam Powell
406de58e48
am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
...
* commit '6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
Fix bug 3399992 - Make ActionBar menu text styleable
2011-01-28 14:01:06 -08:00
Adam Powell
6b2fda9f4b
Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
2011-01-28 13:58:28 -08:00
Joe Onorato
8b16ebd0e8
am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
...
* commit 'b940659f415d536966f1bb8af4d5281efa3a7f7a':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:45:42 -08:00
Joe Onorato
b940659f41
am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
...
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:43:17 -08:00
Adam Powell
55f3af27ed
Fix bug 3399992 - Make ActionBar menu text styleable
...
Change-Id: Ic67d167c024332575ca3b79725f012a919146286
2011-01-28 13:42:04 -08:00
Joe Onorato
94eb3d0f7e
Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
2011-01-28 13:40:28 -08:00
Dianne Hackborn
e579b34752
am 6a11185b: am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit '6a11185b9293151cb3c12c296cf989ea0e7cb898':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:50:45 -08:00
Dianne Hackborn
6a11185b92
am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:48:32 -08:00
Dianne Hackborn
c8c3021ac3
Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
2011-01-27 22:46:44 -08:00
Joe Onorato
857fd9b856
Plumb whether an input view is actually visible or not through from the IME
...
to the status bar.
Bug: 3391067
Change-Id: I049531155bf7ee0b29874916c0b5b0a45b73c09e
2011-01-27 21:19:46 -08:00
Nick Pelly
2478e617c4
resolved conflicts for merge of b7d6ffd7 to honeycomb-merge
...
Change-Id: If5553e0b51513687c4012600d92323617190fb6c
2011-01-27 18:35:19 -08:00
Nick Pelly
0cad3d23d3
resolved conflicts for merge of a701cf85 to honeycomb-merge
...
Change-Id: I81a63599649a61fc73bf1e7ebcfed4c333903070
2011-01-27 16:59:02 -08:00
Nick Pelly
34afc2cd83
am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
...
* commit 'd350dc0492fab3614749955f5dcf21ec1c522b24':
API: Make close() throw an IOException.
2011-01-27 16:26:28 -08:00
Mike Lockwood
dd8b64c0a5
Merge "Add support for synchronous bulk USB transfers"
2011-01-27 16:25:26 -08:00