Commit Graph

9022 Commits

Author SHA1 Message Date
Mathias Agopian
cd220deff0 am ba37ea55: am 6d9e0c7a: am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebuffer
Merge commit 'ba37ea550d97b753fc74049d22f5e752d4b0185f'

* commit 'ba37ea550d97b753fc74049d22f5e752d4b0185f':
  part of fix [2186418] switch passion to 24-bits framebuffer
2009-11-04 15:20:59 -08:00
Leon Scroggins
5d69be9ed6 am ffb4eeb5: am 3613385f: Do not update the progress if it is the same as the last given progress.
Merge commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c'

* commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c':
  Do not update the progress if it is the same as the last given progress.
2009-11-04 15:20:44 -08:00
Mathias Agopian
5996be6068 am 6d9e0c7a: am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebuffer
Merge commit '6d9e0c7aa797f4dae5f529560e9e7c31336624e3' into eclair-mr2-plus-aosp

* commit '6d9e0c7aa797f4dae5f529560e9e7c31336624e3':
  part of fix [2186418] switch passion to 24-bits framebuffer
2009-11-04 15:10:13 -08:00
Leon Scroggins
04c28f5758 am 3613385f: Do not update the progress if it is the same as the last given progress.
Merge commit '3613385fbc5368715e7af1a6676b7bb63fafcf09' into eclair-mr2-plus-aosp

* commit '3613385fbc5368715e7af1a6676b7bb63fafcf09':
  Do not update the progress if it is the same as the last given progress.
2009-11-04 15:10:05 -08:00
Mathias Agopian
d8fe3745a9 am 36fe3eea: part of fix [2186418] switch passion to 24-bits framebuffer
Merge commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469' into eclair-mr2

* commit '36fe3eeaa056ff13455c0df73b495b2bae8c1469':
  part of fix [2186418] switch passion to 24-bits framebuffer
2009-11-04 14:59:44 -08:00
Mathias Agopian
8b6b95abae part of fix [2186418] switch passion to 24-bits framebuffer
add support for RGBX_8888 EGLConfigs in the software renderer
(since that's what we're using in the MDP case)
2009-11-04 14:51:18 -08:00
Dirk Dougherty
a7b56de3b9 am 5b40ead8: am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '5b40ead81bdd350c3f4a585d851d91e5bec0c5c6'

* commit '5b40ead81bdd350c3f4a585d851d91e5bec0c5c6':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:42:29 -08:00
Dirk Dougherty
09fb6a95f3 am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '0d55daffc31c123dcf83f6db85f8198854ddc564' into eclair-mr2-plus-aosp

* commit '0d55daffc31c123dcf83f6db85f8198854ddc564':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:32:34 -08:00
Dirk Dougherty
0c36a6dc7b am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-mr2

* commit '5fc71e67498ed64ad2d41c23471b008f93cb580e':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:21:20 -08:00
Dirk Dougherty
08fdbc5e9c am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair

* commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 14:12:29 -08:00
Android (Google) Code Review
59ddfd5c91 Merge change I54545dfd into eclair-sdk
* changes:
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
2009-11-04 17:04:41 -05:00
Mathias Agopian
bd51415831 am 43606242: am 8e5e44e9: am 9a54d7dd: Merge change Ibbf945f3 into eclair
Merge commit '4360624241251035534a46449e23be38d9e6b03c'

* commit '4360624241251035534a46449e23be38d9e6b03c':
  fix [2236832] software OpenGL ES driver doesn't work on sholes
2009-11-04 13:46:42 -08:00
Brett Chabot
6a789e7e9e am dcef5348: am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'dcef5348f4457b20bcf29b8754a07160ea572372'

* commit 'dcef5348f4457b20bcf29b8754a07160ea572372':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 13:46:28 -08:00
Jean-Michel Trivi
e4f260e866 am bd38397b: am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit 'bd38397bc4f754c040d4abf5435c2469c3357924'

* commit 'bd38397bc4f754c040d4abf5435c2469c3357924':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 13:46:17 -08:00
Mathias Agopian
4e88a07f97 am 8e5e44e9: am 9a54d7dd: Merge change Ibbf945f3 into eclair
Merge commit '8e5e44e9538fc327800414926651d46967ccc725' into eclair-mr2-plus-aosp

* commit '8e5e44e9538fc327800414926651d46967ccc725':
  fix [2236832] software OpenGL ES driver doesn't work on sholes
2009-11-04 13:23:36 -08:00
Brett Chabot
0a61f0e0aa am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp

* commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 13:23:28 -08:00
Jean-Michel Trivi
44a439e9e1 am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp

* commit '3d2d155a87cdd3038a2e6df8741181431cb250e1':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 13:23:00 -08:00
Mathias Agopian
7617b91eb8 am 9a54d7dd: Merge change Ibbf945f3 into eclair
Merge commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb' into eclair-mr2

* commit '9a54d7dddcbc982d644c627693dc39fb2cb5c0fb':
  fix [2236832] software OpenGL ES driver doesn't work on sholes
2009-11-04 13:14:59 -08:00
Android (Google) Code Review
d5bee93431 Merge change Ibbf945f3 into eclair
* changes:
  fix [2236832] software OpenGL ES driver doesn't work on sholes
2009-11-04 15:45:39 -05:00
Brett Chabot
2a8fb8e15a am c20fc77c: Merge change Iefd4a388 into eclair
Merge commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2

* commit 'c20fc77c5a2bb8483f2e6e8b4064853804502365':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 12:05:45 -08:00
Jean-Michel Trivi
ee0f24fc6f am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2

* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 12:05:34 -08:00
Android (Google) Code Review
495560eab9 Merge change Iefd4a388 into eclair
* changes:
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
2009-11-04 14:56:14 -05:00
Andreas Huber
c4d9a33c61 am 84953593: am ad278f22: Merge change I6bce6d87 into eclair-mr2
Merge commit '8495359382bc7c94a776e51c596e807448796476'

* commit '8495359382bc7c94a776e51c596e807448796476':
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
2009-11-04 10:53:03 -08:00
Andreas Huber
ba093e2364 am 7146332e: am 0533aade: Merge change I313953dc into eclair-mr2
Merge commit '7146332e9999443e22296d6d0968f95b80e79af6'

* commit '7146332e9999443e22296d6d0968f95b80e79af6':
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 10:52:53 -08:00
Andreas Huber
49f6043548 am 66c25573: am 12bc3af0: Merge change I6f6bf3d8 into eclair-mr2
Merge commit '66c2557334d6c8116c874aa65e84b280d325009e'

* commit '66c2557334d6c8116c874aa65e84b280d325009e':
  Support raw audio sources in stagefright commandline tool.
2009-11-04 10:52:42 -08:00
Andreas Huber
8e66febb3b am 5a58de8b: am 2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de'

* commit '5a58de8b3bb1b6cc5304f83c8a3d527f952b91de':
  Fix MP3Extractor duration overflows...
2009-11-04 10:52:31 -08:00
Andreas Huber
82d5b50d22 am ad278f22: Merge change I6bce6d87 into eclair-mr2
Merge commit 'ad278f2276de23197571e486ad387dacc7f346ee' into eclair-mr2-plus-aosp

* commit 'ad278f2276de23197571e486ad387dacc7f346ee':
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
2009-11-04 10:43:01 -08:00
Andreas Huber
4dc13eb4aa am 0533aade: Merge change I313953dc into eclair-mr2
Merge commit '0533aadef6d93dec868d648402f5ec326161de57' into eclair-mr2-plus-aosp

* commit '0533aadef6d93dec868d648402f5ec326161de57':
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 10:42:53 -08:00
Andreas Huber
436f930904 am 12bc3af0: Merge change I6f6bf3d8 into eclair-mr2
Merge commit '12bc3af0fb4ce17065d0f17982e0a9da52fc093d' into eclair-mr2-plus-aosp

* commit '12bc3af0fb4ce17065d0f17982e0a9da52fc093d':
  Support raw audio sources in stagefright commandline tool.
2009-11-04 10:42:45 -08:00
Andreas Huber
4f3e9e9918 am 2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '2f1330155153e590548e711d619765edc8ebb62f' into eclair-mr2-plus-aosp

* commit '2f1330155153e590548e711d619765edc8ebb62f':
  Fix MP3Extractor duration overflows...
2009-11-04 10:42:35 -08:00
Android (Google) Code Review
1bc04094fe Merge change I6bce6d87 into eclair-mr2
* changes:
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
2009-11-04 13:33:27 -05:00
Android (Google) Code Review
a0920b3289 Merge change I313953dc into eclair-mr2
* changes:
  Support raw audio sources in MediaPlayerImpl.
2009-11-04 13:33:13 -05:00
Android (Google) Code Review
fb4ff2bea0 Merge change I6f6bf3d8 into eclair-mr2
* changes:
  Support raw audio sources in stagefright commandline tool.
2009-11-04 13:33:02 -05:00
Android (Google) Code Review
7f78a30d08 Merge change I5126e183 into eclair-mr2
* changes:
  Fix MP3Extractor duration overflows...
2009-11-04 13:32:46 -05:00
Android (Google) Code Review
a605297897 Merge change I6869df3a into eclair
* changes:
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 11:49:25 -05:00
Mike Lockwood
c1ae31ed89 am 7efae9ae: am 6de8bbb0: am 27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '7efae9ae50923ebe1bd1b50c0397220b8f0d642f'

* commit '7efae9ae50923ebe1bd1b50c0397220b8f0d642f':
  PowerManagerService: Fix manual brightness mode.
2009-11-04 06:30:27 -08:00
Romain Guy
04f7252e56 am b1c9068f: am 1503f739: am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'b1c9068fa4763547ac35e632077ac40456361065'

* commit 'b1c9068fa4763547ac35e632077ac40456361065':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
2009-11-04 06:30:18 -08:00
Mike Lockwood
5ea5e03091 am 6de8bbb0: am 27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '6de8bbb00a6183c7d4eec76fa7f253cf80736422' into eclair-mr2-plus-aosp

* commit '6de8bbb00a6183c7d4eec76fa7f253cf80736422':
  PowerManagerService: Fix manual brightness mode.
2009-11-04 06:19:50 -08:00
Romain Guy
cd52eb3608 am 1503f739: am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit '1503f739f8a22822fa969c516564063ef46db52a' into eclair-mr2-plus-aosp

* commit '1503f739f8a22822fa969c516564063ef46db52a':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
2009-11-04 06:19:43 -08:00
Mike Lockwood
9ae675ab0f am 27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-mr2

* commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
  PowerManagerService: Fix manual brightness mode.
2009-11-04 06:10:37 -08:00
Romain Guy
a961387924 am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-mr2

* commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
2009-11-04 06:10:26 -08:00
Daisuke Miyakawa
a7261f0ab9 am ffe9b571: am f035b477: Make test compontent support multiple vCard input.
Merge commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934'

* commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934':
  Make test compontent support multiple vCard input.
2009-11-04 05:12:40 -08:00
Daisuke Miyakawa
2776b97bbf am f035b477: Make test compontent support multiple vCard input.
Merge commit 'f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp

* commit 'f035b47774aabf7397aec5c5459ac9860ad63bab':
  Make test compontent support multiple vCard input.
2009-11-04 05:02:50 -08:00
Mathias Agopian
bc4929117d fix [2236832] software OpenGL ES driver doesn't work on sholes
make sure to not pass our fake handles to the real gralloc
2009-11-03 21:08:06 -08:00
Daisuke Miyakawa
242046da07 am 32fd3a00: am 231e01e7: Merge change I202c3106 into eclair-mr2
Merge commit '32fd3a004366092878a2ee3923d6cbed27cd28db'

* commit '32fd3a004366092878a2ee3923d6cbed27cd28db':
  Make ContentValuesBuilder a separate file.
2009-11-03 16:27:59 -08:00
Leon Scroggins
e7ea0ff31b am 91fc3300: am 92534768: Merge change I33909a6a into eclair-mr2
Merge commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057'

* commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057':
  Do not scroll the title bar off screen until the page finishes loading.
2009-11-03 16:27:49 -08:00
Jason Sams
14a91b2ab5 am eb7e27e8: am a1c3681f: am decc139b: Merge change I7a824efc into eclair
Merge commit 'eb7e27e8007d1b27d3e01c376b6747dc885db517'

* commit 'eb7e27e8007d1b27d3e01c376b6747dc885db517':
  Support applications changing the surface attached to the RS.
2009-11-03 16:27:39 -08:00
Daisuke Miyakawa
b525e0ee47 am 7113f59d: am d14ea3c7: Merge change If338e940 into eclair-mr2
Merge commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99'

* commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99':
  Introduce ContentValuesBuilder and make tests easier to read.
2009-11-03 16:27:29 -08:00
Daisuke Miyakawa
dc373d757c am 231e01e7: Merge change I202c3106 into eclair-mr2
Merge commit '231e01e7922abae0b33f0aec95275a5cc1b0209d' into eclair-mr2-plus-aosp

* commit '231e01e7922abae0b33f0aec95275a5cc1b0209d':
  Make ContentValuesBuilder a separate file.
2009-11-03 16:22:18 -08:00
Leon Scroggins
1450c65f94 am 92534768: Merge change I33909a6a into eclair-mr2
Merge commit '925347688d946d9782bc1cfaa95baacd5b630e38' into eclair-mr2-plus-aosp

* commit '925347688d946d9782bc1cfaa95baacd5b630e38':
  Do not scroll the title bar off screen until the page finishes loading.
2009-11-03 16:22:10 -08:00