Commit Graph

12088 Commits

Author SHA1 Message Date
Siva Velusamy
330baa51a8 am 8967cbff: Merge "Remove swing-worker."
* commit '8967cbffa5218f6708fdae526517f7ac146182f6':
  Remove swing-worker.
2013-02-19 11:37:26 -08:00
Siva Velusamy
8967cbffa5 Merge "Remove swing-worker." 2013-02-19 19:27:38 +00:00
Siva Velusamy
748e9da089 Remove swing-worker.
Change-Id: Ice7f98745424b0063e3c09c4a93a209a11146c17
2013-02-19 11:01:18 -08:00
Jesse Hall
a0579871af Fix glShaderSource parameter constness
Change-Id: I1008d779a9d333dc8968812d22e387b804e3c570
2013-02-15 14:19:35 -08:00
James Dong
74918c2456 Merge "Make software vp8 video encoder available to MediaCodec on emulator" 2013-02-13 18:19:30 +00:00
James Dong
b92e9cdd21 Make software vp8 video encoder available to MediaCodec on emulator
Change-Id: I7da75ea335c0b07df876de473545f170138c56b7
2013-02-13 10:13:20 -08:00
Chris Banes
3b7f23f881 bitmapfun: Add support to use inBitmap option
This adds support for devices running Honeycomb or newer
to use the inBitmap BitmapFactory option when decoding images. The way
it accomplishes this is by adding a second level 'memory cache' using
SoftReferences. When an item is removed from the LruCache it is added
to this SoftReference Set. The next time an image is decoded, the Set
is searched to see if it contains a bitmap that can be re-used.

Change-Id: I8f980160ddc7116731b25e6f3f110c38f207f286
Signed-off-by: Chris Banes <chrisbanes@google.com>
2013-02-13 13:19:09 +00:00
Xavier Ducrohet
446e52e4fe am bcc848c1: (-s ours) am 71c6b7ae: am 7b7aca60: Move rev for 2 for API 17 and 12 for support. do not merge.
# Via Android Git Automerger (2) and Xavier Ducrohet (1)
* commit 'bcc848c188fad6d5d15631dd24c0f9747c4fc76d':
  Move rev for 2 for API 17 and 12 for support. do not merge.
2013-02-12 09:34:45 -08:00
Xavier Ducrohet
bcc848c188 am 71c6b7ae: am 7b7aca60: Move rev for 2 for API 17 and 12 for support. do not merge.
# Via Android Git Automerger (1) and Xavier Ducrohet (1)
* commit '71c6b7ae8516c2d5b4c54fbf978888d3ebbc7100':
  Move rev for 2 for API 17 and 12 for support. do not merge.
2013-02-12 09:32:32 -08:00
Xavier Ducrohet
71c6b7ae85 am 7b7aca60: Move rev for 2 for API 17 and 12 for support. do not merge.
# Via Xavier Ducrohet
* commit '7b7aca60bab50575c595a283facaa80999beba61':
  Move rev for 2 for API 17 and 12 for support. do not merge.
2013-02-12 09:30:32 -08:00
Xavier Ducrohet
7b7aca60ba Move rev for 2 for API 17 and 12 for support. do not merge.
Change-Id: I8b3b1a964fb523bb2906cc15264914ffad147648
2013-02-12 09:27:51 -08:00
The Android Open Source Project
b3ac0f9565 am 38596923: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# Via The Android Automerger (1) and The Android Open Source Project (1)
* commit '385969235051b2d8d9f4b1e5d2d6d207ab6a8898':
2013-02-08 15:42:09 -08:00
The Android Open Source Project
3859692350 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Id4dcf1e5d36d456a1fea85b8bcce602611dcc4db
2013-02-08 15:40:36 -08:00
Andy Stadler
537a4d190a Merge "Clean up classpath - bye bye Camera" 2013-02-08 20:52:53 +00:00
Andy Stadler
dd5b61cd09 Clean up classpath - bye bye Camera
Change-Id: I988bacb5c4fdc071f77b174e934114bf655df0ed
2013-02-08 11:56:13 -08:00
Raphael Moll
599c4c41a5 am de7e352b: am ddb45cd3: am 68251f81: Merge "Adjust sdk to new prebuilts location."
# Via Android Git Automerger (2) and others
* commit 'de7e352b15e83b50d3003d92561b8942e3bfdadc':
  Adjust sdk to new prebuilts location.
2013-02-08 11:42:59 -08:00
Raphael Moll
de7e352b15 am ddb45cd3: am 68251f81: Merge "Adjust sdk to new prebuilts location."
# Via Android Git Automerger (1) and others
* commit 'ddb45cd3e9fb5ce63b636823d9be693dceb6ee55':
  Adjust sdk to new prebuilts location.
2013-02-08 10:13:29 -08:00
Raphael Moll
ddb45cd3e9 am 68251f81: Merge "Adjust sdk to new prebuilts location."
# Via Gerrit Code Review (1) and Raphael Moll (1)
* commit '68251f8115197b1bef0bd1e2bb06bcb491dededc':
  Adjust sdk to new prebuilts location.
2013-02-08 10:11:31 -08:00
Raphael Moll
68251f8115 Merge "Adjust sdk to new prebuilts location." 2013-02-08 17:59:26 +00:00
The Android Automerger
04e0a9cfd0 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-07 14:23:19 -08:00
Chris Banes
a1a83e1f25 am e6edd932: am d3dc2b12: am 2a84299d: am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'e6edd9322b43ef14da2e447b45183bf07262238f':
  Update bitmapfun sample to call recycle()
2013-02-07 11:19:47 -08:00
Chris Banes
e6edd9322b am d3dc2b12: am 2a84299d: am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit 'd3dc2b12e21305685920d262cfdc093dfaf1da0b':
  Update bitmapfun sample to call recycle()
2013-02-07 09:25:08 -08:00
Chris Banes
d3dc2b12e2 am 2a84299d: am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '2a84299d4d8e1944f2af66199b784004d639deaa':
  Update bitmapfun sample to call recycle()
2013-02-07 09:17:21 -08:00
Chris Banes
2a84299d4d am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Chris Banes (1)
* commit 'f4535aee56bf564f962dbcbdc0ce03af98f0ebd4':
  Update bitmapfun sample to call recycle()
2013-02-07 09:15:44 -08:00
Chris Banes
f4535aee56 Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev 2013-02-07 17:12:28 +00:00
Mathias Agopian
2373f44281 Merge "clean-up sensor emulation code." 2013-02-07 03:08:32 +00:00
Mathias Agopian
6e263d5568 clean-up sensor emulation code.
don't blindly access the "status" field which is not used for all sensors.

Change-Id: I6ff80cf37b8feeccddfd843480db1861aabbedf1
2013-02-06 18:57:04 -08:00
Trevor Johns
dc452cf178 Merge "Remove MailSync demo" 2013-02-07 02:54:28 +00:00
Raphael Moll
862ae1efae Adjust sdk to new prebuilts location.
Change-Id: I4a2cb710ef3c22b7b3c90e5b4ee7757087ebe44c
2013-02-06 16:45:26 -08:00
Chris Banes
4d6574e878 Update bitmapfun sample to call recycle()
A new sub-class of BitmapDrawable has been created which tracks
when it is being used or cached when running on Gingerbread or
older. A new ImageView subclass has been added to accomplish this,
as well as changes to the LruCache.

Change-Id: I95d3334684703aebb6b09fcd56194cf73e3c2dcf
Signed-off-by: Chris Banes <chrisbanes@google.com>
2013-02-06 16:21:21 +00:00
Wink Saville
eb331e827b Merge "Update voip in classpath" 2013-02-05 22:41:58 +00:00
Dirk Dougherty
2ef571bced am c8286562: am 24600336: am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'c82865621bb29c9fdf0d7f25b2a492b36adef927':
  Add redirect for removed file.
2013-02-05 14:15:57 -08:00
Dirk Dougherty
c82865621b am 24600336: am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '246003369211d3f0a035c4ae23e63b234080e4fd':
  Add redirect for removed file.
2013-02-05 14:13:56 -08:00
Dirk Dougherty
2460033692 am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '64f03f37e3c0963c168ec7517d4c6ebe588e3c33':
  Add redirect for removed file.
2013-02-05 14:11:07 -08:00
Dirk Dougherty
64f03f37e3 am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '451d3b83cfbfd807ec3b86e3e2877cc8b2a39bab':
  Add redirect for removed file.
2013-02-05 14:08:30 -08:00
Dirk Dougherty
451d3b83cf Merge "Add redirect for removed file." into jb-mr1-dev 2013-02-05 22:06:58 +00:00
Dirk Dougherty
184a1dc183 Add redirect for removed file.
Change-Id: I94c59f54ab7daaae588f61c02601b7599799894b
2013-02-05 14:05:04 -08:00
The Android Open Source Project
1657a0d586 am b3459b08: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# Via The Android Automerger (5) and The Android Open Source Project (1)
* commit 'b3459b08c398250747a44a9d4e96ad3832e3e7f3':
2013-02-05 13:48:54 -08:00
The Android Open Source Project
b3459b08c3 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I37667f21ee86fe7aafbf7f44573b27d7eb573f7e
2013-02-05 13:44:54 -08:00
Stephen Hines
4a31681276 Merge "Update HelloCompute to use separate output bitmap." 2013-02-05 21:42:50 +00:00
The Android Automerger
49e44d8dfe merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-05 12:24:08 -08:00
Dirk Dougherty
6149c80080 am 851b4032: am 0d594020: am a9fe80d2: am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '851b40325449e9a0fabd2f9667f707860b94d51e':
  Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:57:17 -08:00
Dirk Dougherty
851b403254 am 0d594020: am a9fe80d2: am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '0d5940203cd866858e07b381ea8104d8c99286a8':
  Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:55:19 -08:00
Dirk Dougherty
0d5940203c am a9fe80d2: am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit 'a9fe80d20405e38946d4e54a361e58f4c2137165':
  Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:53:24 -08:00
Dirk Dougherty
a9fe80d204 am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
# Via Dirk Dougherty
* commit '388ea1e3e55bf37f22a6b98bcd57da1cb4b31032':
  Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
2013-02-05 09:51:08 -08:00
Andrew Hsieh
803b58a180 am b070a3d4: am 18c3a185: Merge "Fix warnings in sample detected by NDK_ANALYZE=1"
# Via Andrew Hsieh (1) and others
* commit 'b070a3d46b1f1f0cf6efeb6991f428652a82a97c':
  Fix warnings in sample detected by NDK_ANALYZE=1
2013-02-05 00:16:16 -08:00
Andrew Hsieh
b070a3d46b am 18c3a185: Merge "Fix warnings in sample detected by NDK_ANALYZE=1"
# Via Andrew Hsieh (1) and Gerrit Code Review (1)
* commit '18c3a185c64a87791ccedb802203fda7b5290916':
  Fix warnings in sample detected by NDK_ANALYZE=1
2013-02-05 00:12:06 -08:00
Andrew Hsieh
18c3a185c6 Merge "Fix warnings in sample detected by NDK_ANALYZE=1" 2013-02-05 08:10:17 +00:00
Adam Koch
6addcd306b am 5d849d6f: am 5f404299: am aa3687df: am 2e5555e0: Bitmapfun Sample: Fix bug where background image loading could hang
# Via Android Git Automerger (3) and Adam Koch (1)
* commit '5d849d6f5003cb96c9c36f675c451a0dd57c02de':
  Bitmapfun Sample: Fix bug where background image loading could hang
2013-02-04 16:43:41 -08:00
Dirk Dougherty
388ea1e3e5 Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
Change-Id: If2fdf0b92d560fcfbbcfe0f5ec65dd6dcf471560
2013-02-04 13:19:46 -08:00