Patrick Scott
d1737edc13
Do not merge.
...
Cherry picked:
Add an api to toggle content url access.
By default, WebView allows access to content providers on the system. This
setting allows applications to turn off content urls.
Bug: 1196879
Change-Id: I49eaea6d7b9ccc3b3a4443d712222556087568c0
2011-01-12 12:42:51 -05:00
Chet Haase
efcceb856a
New interpolator resources now found in interpolator/ directory
...
Change-Id: Ib08200d71fce1706a0c683df104f0ff3d777ca17
2011-01-12 07:41:31 -08:00
Wei-Ta Chen
25bce3a673
Do not merge.
...
Backport changes related to BitmapRegionDecoder from HoneyComb to
Gingerbread.
Bug: 3309014
////////////////////////////////////////////////////
This is a combination of 7 commits.
Revert "Do not merge."
This reverts commit f7681f84918c27f6a626681ce37ed2a236c44e82.
Change-Id: I46fd710600b1649773eaea2d9abc2b21a592f9a6
Fix a initialization bug in BitmapRegionDecoder.
Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5
Fix segfault when tring to throw IOException.
Change-Id: I530cc4409ba4ca17cec933afad077c5f60ba554f
Fix 3122139, where previewing an attachment for the second time will
fail.
Use AutoFDSeek to mark and restore the position before we read data from
the descriptor.
Change-Id: I3d4f012dce486e19b113bc90a98b94031cfa8195
Add inPreferQualityOverSpeed into BitmapFactory.Options.
The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.
The field by default is not set and thus does not affect existing
applications.
Bug: 3238925
Change-Id: I93d55b7226e47a43e639325cd1a677694d6f2ee4
Unhide inPreferQualityOverSpeed in BitmapFactory.Options.
The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.
The field by default is not set and thus does not affect existing
applications.
Bug: 3238925
Related changes: https://android-git.corp.google.com/g/#change,83291 and
https://android-git.corp.google.com/g/#change,83294
Change-Id: I969f5c413f9b2179454aeb90e18ae8222ee583b4
Correct the API comments.
BitmapRegionDecoder supports PNG as well.
2011-01-11 22:54:10 -08:00
Christopher Tate
00ac23f104
am 771fcc5e: am 28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
...
* commit '771fcc5e3d87f81663fe91149f3b680beec65f4a':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
2011-01-11 20:06:19 -08:00
Christopher Tate
771fcc5e3d
am 28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
...
* commit '28514f8f9cdac95799d5654a30fe36ef05443dd3':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
2011-01-11 20:03:57 -08:00
Christopher Tate
02d2b3ba9b
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
...
There will be, in the future, a flag (View.DRAG_FLAG_GLOBAL) that means
for the drag to be cross-application. For now that flag constant is @hide
and furthermore the server-side implementation strips it, enforcing
local-only drags.
Change-Id: I8db840480ab90e18a5b8ecf29d62b4e6eafd405e
2011-01-11 18:30:23 -08:00
Dianne Hackborn
b540514cb2
am b5637c46: am 45a8f53b: Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
...
* commit 'b5637c467d7ea859f589d2006f3806c5a2c4a27f':
Get rid of old ParcelFileDescriptor API.
2011-01-11 18:02:58 -08:00
Dianne Hackborn
b5637c467d
am 45a8f53b: Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
...
* commit '45a8f53b25c8306c7f2c37f3a1d70ace21956e28':
Get rid of old ParcelFileDescriptor API.
2011-01-11 18:00:26 -08:00
Dianne Hackborn
540f86aa42
Get rid of old ParcelFileDescriptor API.
...
Also some new debugging code in AsyncTaskLoader.
Change-Id: Ib13386b7862821cf0ee31b003bedef78f46240f1
2011-01-11 17:56:12 -08:00
Alex Sakhartchouk
dcc231955d
Adding ability to load cubemaps from individual faces.
...
Change-Id: Ic8b6693f625c181e031d4393ba8fac40049da88b
2011-01-11 14:47:44 -08:00
Chet Haase
a154af9755
am 0eef63d8: am d8650114: All animator resources moved to res/animator
...
* commit '0eef63d8c8872b733dd37554ddb309e3ab037783':
All animator resources moved to res/animator
2011-01-11 13:20:24 -08:00
Chet Haase
0eef63d8c8
am d8650114: All animator resources moved to res/animator
...
* commit 'd865011473aae8dcddc4a8a1350c46d6aed4079a':
All animator resources moved to res/animator
2011-01-11 13:18:47 -08:00
Chet Haase
d865011473
All animator resources moved to res/animator
...
Change-Id: I9342ff21e9a15ba29da946e091343a6f8223c181
2011-01-11 12:50:24 -08:00
Gilles Debunne
923505803a
New QuickContactBadge holo style.
...
The background is removed. A blue triangle is displayed on the lower right corner.
Now theme dependant.
Change-Id: I984ac5185039569bd378af9f15b59d11fd1b5c8f
2011-01-11 11:12:51 -08:00
Chet Haase
39132fe076
am 44efd13a: am 53ee3316: Rename RGBEvaluator to ArgbEvaluator
...
* commit '44efd13afc9af78b11b53d86882f1b89f5816239':
Rename RGBEvaluator to ArgbEvaluator
2011-01-11 07:08:00 -08:00
Chet Haase
44efd13afc
am 53ee3316: Rename RGBEvaluator to ArgbEvaluator
...
* commit '53ee3316bcb3590ff156b3fd7108903c0817c35d':
Rename RGBEvaluator to ArgbEvaluator
2011-01-11 07:05:37 -08:00
Chet Haase
53ee3316bc
Rename RGBEvaluator to ArgbEvaluator
...
Change-Id: Iee74b475960d623fa757349e4053bd7c58cf5734
2011-01-11 06:46:44 -08:00
Patrick Scott
f0b70dcc40
Add an api to toggle content url access.
...
By default, WebView allows access to content providers on the system. This
setting allows applications to turn off content urls.
Bug: 1196879
Change-Id: Iad25e7171a57a9ff392cbb39057468d36355b153
2011-01-11 09:15:01 -05:00
Mike Lockwood
b3334f2d9b
am 374816d4: am 3459e27e: un@hide android.os.Environment.isExternalStorageEmulated()
...
* commit '374816d47a0e812dfbf448d2c9905d449cece063':
un@hide android.os.Environment.isExternalStorageEmulated()
2011-01-10 19:41:22 -08:00
Mike Lockwood
374816d47a
am 3459e27e: un@hide android.os.Environment.isExternalStorageEmulated()
...
* commit '3459e27e5d2f92d2d5487c189c9386c031e79fc1':
un@hide android.os.Environment.isExternalStorageEmulated()
2011-01-10 19:38:44 -08:00
Mike Lockwood
3459e27e5d
un@hide android.os.Environment.isExternalStorageEmulated()
...
Change-Id: I35e7dc59763595523cb5af569e237bcff5cf1b49
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 22:12:31 -05:00
Joe Onorato
3cb0c00fec
am af39af61: am 9c3850f2: Merge "current.xml" into honeycomb
...
* commit 'af39af61c9b6f872a0e5f6c1795a01cf03a34417':
current.xml
2011-01-10 18:06:40 -08:00
Joe Onorato
fab3f2fef8
am cb649050: am e5e95588: Merge "add ComponentInfo.isEnabled()" into honeycomb
...
* commit 'cb649050a9af1df45df5e99f965307e6684ac56d':
add ComponentInfo.isEnabled()
2011-01-10 18:06:22 -08:00
Romain Guy
ae32998b3c
am 5e96448f: am 58818ab5: Merge "Fix the build" into honeycomb
...
* commit '5e96448fd9addcc8e7bf1e06aa0fc4b2ab2a517d':
Fix the build
2011-01-10 18:06:06 -08:00
Mike Lockwood
09cfbaee60
am b0dbc1b5: am f9a04233: @hide android.permission.WRITE_MEDIA_STORAGE
...
* commit 'b0dbc1b5a6e423399bbab54b2af82136abca98ba':
@hide android.permission.WRITE_MEDIA_STORAGE
2011-01-10 18:05:09 -08:00
Joe Onorato
af39af61c9
am 9c3850f2: Merge "current.xml" into honeycomb
...
* commit '9c3850f24e66d4c61337e749da843444cbb65d10':
current.xml
2011-01-10 17:44:16 -08:00
Joe Onorato
cb649050a9
am e5e95588: Merge "add ComponentInfo.isEnabled()" into honeycomb
...
* commit 'e5e9558871df227a09420fed6f16c33e6af0e3e7':
add ComponentInfo.isEnabled()
2011-01-10 17:36:42 -08:00
Joe Onorato
77bbf6f066
current.xml
...
Change-Id: I58cacb79f4d44a0cf90ddbe5efcdcb50f6db81ce
2011-01-10 17:35:21 -08:00
Romain Guy
5e96448fd9
am 58818ab5: Merge "Fix the build" into honeycomb
...
* commit '58818ab5b5dd14f5b40602cd07114de78c110b58':
Fix the build
2011-01-10 17:34:22 -08:00
Joe Onorato
e5e9558871
Merge "add ComponentInfo.isEnabled()" into honeycomb
2011-01-10 17:33:18 -08:00
Romain Guy
58818ab5b5
Merge "Fix the build" into honeycomb
2011-01-10 17:30:57 -08:00
Romain Guy
c71ad30f0c
Fix the build
...
Change-Id: I39fde4140240bdd7fdb5d2823e990efbfde4a83e
2011-01-10 17:33:55 -08:00
Joe Onorato
a85a91573a
add ComponentInfo.isEnabled()
...
Change-Id: I5ce59f62dc0ce3ce446bdbe397d1515e43031d76
2011-01-10 17:26:39 -08:00
Romain Guy
504c28145b
am c39adfd0: am 3b703f2d: Hide Canvas.getGL()
...
* commit 'c39adfd0053da3465bd042984acaa90897298258':
Hide Canvas.getGL()
2011-01-10 17:11:40 -08:00
Alex Sakhartchouk
7b88b2e620
am 20cbfc42: am fe852e21: Updating cubemap loading code.
...
* commit '20cbfc42744e5f91d34acb50057180d70e91ff61':
Updating cubemap loading code.
2011-01-10 17:11:33 -08:00
Mike Lockwood
b0dbc1b5a6
am f9a04233: @hide android.permission.WRITE_MEDIA_STORAGE
...
* commit 'f9a04233c1db22a6ddd989b55db725badeae7539':
@hide android.permission.WRITE_MEDIA_STORAGE
2011-01-10 17:02:42 -08:00
Mike Lockwood
f9a04233c1
@hide android.permission.WRITE_MEDIA_STORAGE
...
This permission is not needed for non-system or unbundled apps,
so we don't need it in the public API
Change-Id: I1a2a0349c6c5b7b5dc3104d69f4e39e95b878db9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 19:59:02 -05:00
Romain Guy
3b703f2d11
Hide Canvas.getGL()
...
Change-Id: I6d81cf9f43ce0c990fe30b3b3159c95ac738ae79
2011-01-10 16:42:55 -08:00
Romain Guy
c39adfd005
am 3b703f2d: Hide Canvas.getGL()
...
* commit '3b703f2d11f20efaa953ad31d6c97fe3561efb03':
Hide Canvas.getGL()
2011-01-10 16:41:54 -08:00
Alex Sakhartchouk
20cbfc4274
am fe852e21: Updating cubemap loading code.
...
* commit 'fe852e216fdfab20e7b3d3e55247f70634d267b9':
Updating cubemap loading code.
2011-01-10 16:29:27 -08:00
Alex Sakhartchouk
fe852e216f
Updating cubemap loading code.
...
Change-Id: I93bb00e5fd1ccc622d17eba70a510664c2093723
2011-01-10 15:57:57 -08:00
Romain Guy
cdf980182f
am 0a81b17f: am d2c78b39: Fix the build.
...
* commit '0a81b17fbfecb7970df70623f836994041abed06':
Fix the build.
2011-01-10 15:06:24 -08:00
Romain Guy
d2c78b3972
Fix the build.
...
Change-Id: Ief8734697e8fdacb6fdbfdbd78793e06beb86d26
2011-01-10 15:01:13 -08:00
Romain Guy
0a81b17fbf
am d2c78b39: Fix the build.
...
* commit 'd2c78b39724d1d7b6e4f7bd54d0022c2847e9127':
Fix the build.
2011-01-10 15:00:23 -08:00
Nick Pelly
a058f56566
am ca36d863: Update API current.xml to unbreak build.
...
* commit 'ca36d863cc1684807e93f442c5ace89f08b9b5f5':
Update API current.xml to unbreak build.
2011-01-10 14:19:30 -08:00
Nick Pelly
ca36d863cc
Update API current.xml to unbreak build.
...
Change-Id: I151ee987fdae73fdf8f339dbb64f8fd27a0436b6
2011-01-10 14:16:16 -08:00
Jesse Wilson
5887c9459a
am 48526d69: am eb97c0dd: Patch new JSON APIs with changes informed by GSON.
...
* commit '48526d6994c565ba223a02e45fea6faeeea6279c':
Patch new JSON APIs with changes informed by GSON.
2011-01-10 13:01:44 -08:00
Jesse Wilson
48526d6994
am eb97c0dd: Patch new JSON APIs with changes informed by GSON.
...
* commit 'eb97c0ddc063176c26065fc6855188edf0c16e03':
Patch new JSON APIs with changes informed by GSON.
2011-01-10 12:59:59 -08:00
Jesse Wilson
eb97c0ddc0
Patch new JSON APIs with changes informed by GSON.
...
Change-Id: I86c12a123080cc06ab23d11d1563bb52c5902517
2011-01-10 12:56:31 -08:00
Nick Pelly
19326cdcbf
am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
...
* commit 'd64d711d457326b503981f7e55ab1448fa23ad9f':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-10 12:06:39 -08:00