2303 Commits

Author SHA1 Message Date
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
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
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
Gilles Debunne
33a9f9bd3a am 91736984: am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
* commit '917369844f83604e528bee49ba042a2d1fe32509':
  Fix for an NPE in Account settings on long press.
2011-01-10 10:18:22 -08:00
Gilles Debunne
917369844f am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
* commit '58f750ad145e6920c1c75bed8b333e54d78f3fed':
  Fix for an NPE in Account settings on long press.
2011-01-10 10:15:48 -08:00
Gilles Debunne
b0db5940c9 Fix for an NPE in Account settings on long press.
Bug 3333512

Change-Id: Ief79e824b86b964598f00ef74c6b5c61c0730242
2011-01-10 10:00:37 -08:00
Nick Pelly
b4003bf73e Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
The later feels less clumsy.

Change-Id: I50f29aef23d2993dcfd25f4c4f2cb0d77bdc0610
2011-01-10 17:28:03 +11:00
Jeff Hamilton
0091091a3c am e3db3d62: Merge commit \'525f953b\' into manualmerge
* commit 'e3db3d6209c234e032775079a1e1489478dabf86':
  Make the new NFC APIs public.
2011-01-09 19:04:15 -08:00
Jeff Hamilton
e3db3d6209 Merge commit '525f953b' into manualmerge
Conflicts:
	api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
2011-01-09 21:01:56 -06:00
Brett Chabot
8cff70eddc am d320877f: am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.
* commit 'd320877f32ddfc70b10457e0ea1494f6ef1f544b':
  Add ActivityManager#isRunningInTestHarness() public API.
2011-01-09 16:38:08 -08:00
Brett Chabot
3b4fcbc9f1 Add ActivityManager#isRunningInTestHarness() public API.
Replaces use of ro.monkey system property. This new API is controlled by
ro.test_harness.

Bug 3329873

Change-Id: Idb5bbbd9ca691976ef842eec681be34c29915976
2011-01-09 16:31:11 -08:00
Jason Sams
41a40bf0af am 70ff3085: am ccf9d10b: Merge "Hide and delete some code that should not be public." into honeycomb
* commit '70ff30855ebef67b7b5eef9453022779ddf4c5df':
  Hide and delete some code that should not be public.
2011-01-09 14:01:55 -08:00
Jason Sams
67e3d206ca Hide and delete some code that should not be public.
Change-Id: Ibe201c235fc81ef1fecb120d6049d6e56222462c
2011-01-09 13:49:31 -08:00
Kenny Root
6c4d904851 Add the {get,set}PackageObbPaths calls to API
Add getPackageObbPaths() and setPackageObbPaths() to the public API.

Bug: 3214719
Change-Id: Icb9f2f92f8c59bb3d31317f609854e81abbd1449
2011-01-09 13:20:28 -08:00
Dianne Hackborn
7079ef0824 am 5ef0a153: am 247fe74c: Implement issue # 3255887 could CursorLoader offer...
* commit '5ef0a153f01362a3263d3cd608ece09cc67377df':
  Implement issue # 3255887 could CursorLoader offer...
2011-01-08 18:29:19 -08:00
Dianne Hackborn
247fe74c93 Implement issue # 3255887 could CursorLoader offer...
...to throttle contentobserver-based requeries

Why yes, I guess it could.

This also reworks AsyncTaskLoader to not generate multiple
concurrent tasks if it is getting change notifications before
the last background task is complete.

And removes some of the old APIs that had been deprecated but
need to be gone for final release.

And fixes a few little problems with applying the wrong theme
in system code.

Change-Id: Ic7a665b666d0fb9d348e5f23595532191065884f
2011-01-08 18:25:30 -08:00
Adam Powell
dfcd15b1aa am 6de1301b: am 947f7824: Fix bug 3245465 - Themed dialog icons
* commit '6de1301b492a1d8450fa61fcff6a3e34437b8891':
  Fix bug 3245465 - Themed dialog icons
2011-01-08 13:24:49 -08:00
Adam Powell
947f782411 Fix bug 3245465 - Themed dialog icons
Added light/dark versions of holo dialog icons. Apps using
AlertDialogs that wish to use the system dialog icon should use
setIconAttribute(android.R.attr.alertDialogIcon) instead of
setIcon(android.R.drawable.ic_alert_dialog).

Change-Id: I40793a3164478be5ffa045ededfcab8210753a4b
2011-01-08 13:09:51 -08:00
Jamie Gennis
37c45fa415 am fd6f39e1: Enable camera preview to a SurfaceTexture.
* commit 'fd6f39e147dc077139a41b9c2a4039fbaa20224e':
  Enable camera preview to a SurfaceTexture.
2011-01-08 04:40:19 -08:00
Jason Sams
47a456a32c am fa445b93: Cleanup subdata apis
* commit 'fa445b9353972735d8d65e8a936786b1afe9886d':
  Cleanup subdata apis
2011-01-08 04:39:41 -08:00
Jamie Gennis
fd6f39e147 Enable camera preview to a SurfaceTexture.
This change adds a public Java API to use a SurfaceTexture as the
destination of camera preview frames.

Change-Id: If537fed2df12c5c181e2af5f817985c1bda853fb
2011-01-07 17:40:24 -08:00
Jason Sams
fa445b9353 Cleanup subdata apis
Change-Id: I70d0d5e4ca2b42f3a9cbf854fe47917cee8f46df
2011-01-07 17:04:29 -08:00
Christopher Tate
627bf68e0e am c5483785: Merge "Rename drag "thumbnail" to the drag "shadow"" into honeycomb
* commit 'c548378562de67c0050f140fc6e7520444f7e8f2':
  Rename drag "thumbnail" to the drag "shadow"
2011-01-07 16:39:56 -08:00
Christopher Tate
36d4c3f02b Rename drag "thumbnail" to the drag "shadow"
No functional changes; just a rename of the relevant class/method/parameters.

Change-Id: I55d9ef7c2c17892b0bc99f5da622c281e006b53e
2011-01-07 16:30:44 -08:00
Gilles Debunne
7e0bb6d9aa am c43d13f4: Merge "Removed XmlAdapters from frameworks." into honeycomb
* commit 'c43d13f495f59bbef6ba439afc4da035a7520647':
  Removed XmlAdapters from frameworks.
2011-01-07 12:45:22 -08:00
Gilles Debunne
0633549799 Removed XmlAdapters from frameworks.
Has been moved to samples.

Change-Id: Icc0530d78df9755a4a1fe9314fa557a91da408c6
2011-01-07 12:14:27 -08:00