OSDN Git Service
Fred Quintana [Thu, 5 Nov 2009 22:01:44 +0000 (14:01 -0800)]
am
3266c5f1: resolved conflicts for merge of
f476c480 to eclair-mr2
Merge commit '
3266c5f125be34aae0f50e0e3397b14d9a603ad0' into eclair-mr2-plus-aosp
* commit '
3266c5f125be34aae0f50e0e3397b14d9a603ad0':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Fred Quintana [Thu, 5 Nov 2009 19:46:11 +0000 (11:46 -0800)]
resolved conflicts for merge of
f476c480 to eclair-mr2
Android (Google) Code Review [Thu, 5 Nov 2009 19:15:54 +0000 (14:15 -0500)]
Merge change I48cbd0bc into eclair
* changes:
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Vasu Nori [Thu, 5 Nov 2009 18:01:09 +0000 (10:01 -0800)]
am
195a507f: Merge change I272af007 into eclair-mr2
Merge commit '
195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp
* commit '
195a507fc364d249c8ff4d3cd86dea00f383b0aa':
a possible fix for the bug http://b/issue?id=
2200637
Android (Google) Code Review [Thu, 5 Nov 2009 17:53:34 +0000 (12:53 -0500)]
Merge change I272af007 into eclair-mr2
* changes:
a possible fix for the bug http://b/issue?id=
2200637
Wei-Ta Chen [Thu, 5 Nov 2009 09:55:59 +0000 (01:55 -0800)]
am
97f96ef9: Merge change I7f9db307 into eclair-mr2
Merge commit '
97f96ef9f795e0fe0058251bd696fb4a4d747d3c' into eclair-mr2-plus-aosp
* commit '
97f96ef9f795e0fe0058251bd696fb4a4d747d3c':
Modify the behavior of createThumbnailForEXIF() to:
Eric Laurent [Thu, 5 Nov 2009 09:55:51 +0000 (01:55 -0800)]
am
fcae6c71: am
67b69292: Merge change I93f500a5 into eclair
Merge commit '
fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp
* commit '
fcae6c71794696a074cabf20beeb02fd87853e30':
Fix issue
2203561: Sholes: audio playing out of earpiece.
Android (Google) Code Review [Thu, 5 Nov 2009 09:49:46 +0000 (04:49 -0500)]
Merge change I7f9db307 into eclair-mr2
* changes:
Modify the behavior of createThumbnailForEXIF() to: returning SizedThumbnailBitmap, which contains the downsampled bitmap either from the thumbnail in EXIF or the full image.
Eric Laurent [Thu, 5 Nov 2009 08:01:33 +0000 (00:01 -0800)]
am
67b69292: Merge change I93f500a5 into eclair
Merge commit '
67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2
* commit '
67b692920c18f99b096dce285adc6f7439fa866c':
Fix issue
2203561: Sholes: audio playing out of earpiece.
Android (Google) Code Review [Thu, 5 Nov 2009 07:55:26 +0000 (02:55 -0500)]
Merge change I93f500a5 into eclair
* changes:
Fix issue
2203561: Sholes: audio playing out of earpiece.
Daisuke Miyakawa [Thu, 5 Nov 2009 04:57:35 +0000 (20:57 -0800)]
am
dc0f9efd: Merge change I0d442f0d into eclair-mr2
Merge commit '
dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp
* commit '
dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
Add tests for Japanization part of vCard.
Romain Guy [Thu, 5 Nov 2009 04:57:27 +0000 (20:57 -0800)]
am
20777fae: am
584bce31: Merge change I09282f5b into eclair
Merge commit '
20777fae8757036d7d526cf74673d30993b77ac5' into eclair-mr2-plus-aosp
* commit '
20777fae8757036d7d526cf74673d30993b77ac5':
Fix the build (hopefully.)
Android (Google) Code Review [Thu, 5 Nov 2009 04:49:46 +0000 (23:49 -0500)]
Merge change I0d442f0d into eclair-mr2
* changes:
Add tests for Japanization part of vCard.
Romain Guy [Thu, 5 Nov 2009 02:40:38 +0000 (18:40 -0800)]
am
584bce31: Merge change I09282f5b into eclair
Merge commit '
584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-mr2
* commit '
584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
Fix the build (hopefully.)
Android (Google) Code Review [Thu, 5 Nov 2009 02:33:27 +0000 (21:33 -0500)]
Merge change I09282f5b into eclair
* changes:
Fix the build (hopefully.)
Nick Pelly [Thu, 5 Nov 2009 01:46:43 +0000 (17:46 -0800)]
am
8cf6a2ea: am
61b01632: Merge change I9490271c into eclair
Merge commit '
8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d' into eclair-mr2-plus-aosp
* commit '
8cf6a2eacfe5c255049cbba53bbbfb01ec4a1d9d':
Add BluetoothDevice to SDK AIDL list.
Eric Olsen [Thu, 5 Nov 2009 01:46:35 +0000 (17:46 -0800)]
am
e772eb7a: am
62335430: Merge change I4499ad72 into eclair
Merge commit '
e772eb7af049b55c89241fae799569030c1f5570' into eclair-mr2-plus-aosp
* commit '
e772eb7af049b55c89241fae799569030c1f5570':
Fix bad merge fixes build breakage.
Romain Guy [Thu, 5 Nov 2009 01:46:24 +0000 (17:46 -0800)]
am
05abe8d0: am
131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '
05abe8d01d91389b4b52111ed525aa4c4f4e1b71' into eclair-mr2-plus-aosp
* commit '
05abe8d01d91389b4b52111ed525aa4c4f4e1b71':
Remove unused field and add new API to control the children drawing order.
Nick Pelly [Thu, 5 Nov 2009 01:37:07 +0000 (17:37 -0800)]
am
61b01632: Merge change I9490271c into eclair
Merge commit '
61b01632915181fcf725dc4933cad8c81e700115' into eclair-mr2
* commit '
61b01632915181fcf725dc4933cad8c81e700115':
Add BluetoothDevice to SDK AIDL list.
Eric Olsen [Thu, 5 Nov 2009 01:36:59 +0000 (17:36 -0800)]
am
62335430: Merge change I4499ad72 into eclair
Merge commit '
62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2
* commit '
62335430b05d92ad2255bf20b76b35e012b385c9':
Fix bad merge fixes build breakage.
Romain Guy [Thu, 5 Nov 2009 01:36:46 +0000 (17:36 -0800)]
am
131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '
131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-mr2
* commit '
131564d26ac5b7f963c60802089b9fe1472659f7':
Remove unused field and add new API to control the children drawing order.
Android (Google) Code Review [Thu, 5 Nov 2009 01:32:00 +0000 (20:32 -0500)]
Merge change I9490271c into eclair
* changes:
Add BluetoothDevice to SDK AIDL list.
Android (Google) Code Review [Thu, 5 Nov 2009 01:27:11 +0000 (20:27 -0500)]
Merge change I4499ad72 into eclair
* changes:
Fix bad merge fixes build breakage.
Android (Google) Code Review [Thu, 5 Nov 2009 00:58:00 +0000 (19:58 -0500)]
Merge change I3bbfb4f9 into eclair
* changes:
Remove unused field and add new API to control the children drawing order.
Eric Olsen [Thu, 5 Nov 2009 00:54:29 +0000 (16:54 -0800)]
am
76922b83: am
9053fdb3: Merge change I76127f6f into eclair
Merge commit '
76922b8378f235e79fd861ba846bed833199e59f' into eclair-mr2-plus-aosp
* commit '
76922b8378f235e79fd861ba846bed833199e59f':
Add support for colored LED on jogball backlight.
Daisuke Miyakawa [Thu, 5 Nov 2009 00:54:20 +0000 (16:54 -0800)]
am
5dbeef6e: Merge change I76588b56 into eclair-mr2
Merge commit '
5dbeef6e9844a094f87a3f7d4608b431a6724278' into eclair-mr2-plus-aosp
* commit '
5dbeef6e9844a094f87a3f7d4608b431a6724278':
Make vCard importer handle "PAGER" phone number correctly.
Eric Olsen [Thu, 5 Nov 2009 00:49:31 +0000 (16:49 -0800)]
am
9053fdb3: Merge change I76127f6f into eclair
Merge commit '
9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2
* commit '
9053fdb32b38d1240d856bd6efedf72eefba48d3':
Add support for colored LED on jogball backlight.
Android (Google) Code Review [Thu, 5 Nov 2009 00:45:14 +0000 (19:45 -0500)]
Merge change I76588b56 into eclair-mr2
* changes:
Make vCard importer handle "PAGER" phone number correctly.
Ying Wang [Thu, 5 Nov 2009 00:42:17 +0000 (16:42 -0800)]
am
35ea90de: am
b5e380a7: (-s ours) am
e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit '
35ea90deee5050a66909b2740601bd81f9f29780' into eclair-mr2-plus-aosp
* commit '
35ea90deee5050a66909b2740601bd81f9f29780':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Christopher Tate [Thu, 5 Nov 2009 00:42:10 +0000 (16:42 -0800)]
am
888b702c: am
595596fe: Merge change I561011bc into eclair
Merge commit '
888b702c81b21847b19c4e2845686ed35cc03a0e' into eclair-mr2-plus-aosp
* commit '
888b702c81b21847b19c4e2845686ed35cc03a0e':
Fix #
2176803 - restores from userdebug to user builds not working
Android (Google) Code Review [Thu, 5 Nov 2009 00:39:29 +0000 (19:39 -0500)]
Merge change I76127f6f into eclair
* changes:
Add support for colored LED on jogball backlight.
Ying Wang [Thu, 5 Nov 2009 00:35:15 +0000 (16:35 -0800)]
am
b5e380a7: (-s ours) am
e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit '
b5e380a799b1c22d51364a2b9b3abe02e2eb83cf' into eclair-mr2
* commit '
b5e380a799b1c22d51364a2b9b3abe02e2eb83cf':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Christopher Tate [Thu, 5 Nov 2009 00:35:06 +0000 (16:35 -0800)]
am
595596fe: Merge change I561011bc into eclair
Merge commit '
595596fe6b6fd52bf26d224f18b8724a4d151316' into eclair-mr2
* commit '
595596fe6b6fd52bf26d224f18b8724a4d151316':
Fix #
2176803 - restores from userdebug to user builds not working
Ying Wang [Thu, 5 Nov 2009 00:18:04 +0000 (16:18 -0800)]
am
e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
Merge commit '
e33044eadfa9969e71e50d1aff165cbc436b13f3' into eclair
* commit '
e33044eadfa9969e71e50d1aff165cbc436b13f3':
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Android (Google) Code Review [Thu, 5 Nov 2009 00:08:59 +0000 (19:08 -0500)]
Merge change Ib9cc041e into eclair-sdk
* changes:
Explicitly specify that online-sdk depends on framework-res. (do not merge)
Android (Google) Code Review [Wed, 4 Nov 2009 23:52:27 +0000 (18:52 -0500)]
Merge change I561011bc into eclair
* changes:
Fix #
2176803 - restores from userdebug to user builds not working
Jason Parks [Wed, 4 Nov 2009 23:10:22 +0000 (15:10 -0800)]
am
6176790e: am
ef16a545: Merge change I2867746d into eclair
Merge commit '
6176790ed5f21ab102d438c252509deda050da0b' into eclair-mr2-plus-aosp
* commit '
6176790ed5f21ab102d438c252509deda050da0b':
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Mathias Agopian [Wed, 4 Nov 2009 23:10:13 +0000 (15:10 -0800)]
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
Leon Scroggins [Wed, 4 Nov 2009 23:10:05 +0000 (15:10 -0800)]
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.
Jason Parks [Wed, 4 Nov 2009 22:59:54 +0000 (14:59 -0800)]
am
ef16a545: Merge change I2867746d into eclair
Merge commit '
ef16a545dca8deacdcdd89cb493d556adf7a8be8' into eclair-mr2
* commit '
ef16a545dca8deacdcdd89cb493d556adf7a8be8':
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Mathias Agopian [Wed, 4 Nov 2009 22:59:44 +0000 (14:59 -0800)]
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
Android (Google) Code Review [Wed, 4 Nov 2009 22:54:00 +0000 (17:54 -0500)]
Merge change I2867746d into eclair
* changes:
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Mathias Agopian [Wed, 4 Nov 2009 00:17:55 +0000 (16:17 -0800)]
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)
Dirk Dougherty [Wed, 4 Nov 2009 22:32:34 +0000 (14:32 -0800)]
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.
Jason Parks [Wed, 4 Nov 2009 22:25:26 +0000 (14:25 -0800)]
When a thread is about to be put back onto the thread pool ensure that it is in the foreground cgroup.
Dirk Dougherty [Wed, 4 Nov 2009 22:21:20 +0000 (14:21 -0800)]
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.
Dirk Dougherty [Wed, 4 Nov 2009 22:12:29 +0000 (14:12 -0800)]
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.
Android (Google) Code Review [Wed, 4 Nov 2009 22:04:41 +0000 (17:04 -0500)]
Merge change I54545dfd into eclair-sdk
* changes:
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Mathias Agopian [Wed, 4 Nov 2009 21:23:36 +0000 (13:23 -0800)]
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
Brett Chabot [Wed, 4 Nov 2009 21:23:28 +0000 (13:23 -0800)]
am
8742696b: am
c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '
8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp
* commit '
8742696b0d74f5dc45093d524d12fbb8abb76fa4':
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Jean-Michel Trivi [Wed, 4 Nov 2009 21:23:00 +0000 (13:23 -0800)]
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.
Mathias Agopian [Wed, 4 Nov 2009 21:14:59 +0000 (13:14 -0800)]
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
Android (Google) Code Review [Wed, 4 Nov 2009 20:45:39 +0000 (15:45 -0500)]
Merge change Ibbf945f3 into eclair
* changes:
fix [
2236832] software OpenGL ES driver doesn't work on sholes
Brett Chabot [Wed, 4 Nov 2009 20:05:45 +0000 (12:05 -0800)]
am
c20fc77c: Merge change Iefd4a388 into eclair
Merge commit '
c20fc77c5a2bb8483f2e6e8b4064853804502365' into eclair-mr2
* commit '
c20fc77c5a2bb8483f2e6e8b4064853804502365':
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Jean-Michel Trivi [Wed, 4 Nov 2009 20:05:34 +0000 (12:05 -0800)]
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.
Android (Google) Code Review [Wed, 4 Nov 2009 19:56:14 +0000 (14:56 -0500)]
Merge change Iefd4a388 into eclair
* changes:
Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles
Andreas Huber [Wed, 4 Nov 2009 18:43:01 +0000 (10:43 -0800)]
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.
Andreas Huber [Wed, 4 Nov 2009 18:42:53 +0000 (10:42 -0800)]
am
0533aade: Merge change I313953dc into eclair-mr2
Merge commit '
0533aadef6d93dec868d648402f5ec326161de57' into eclair-mr2-plus-aosp
* commit '
0533aadef6d93dec868d648402f5ec326161de57':
Support raw audio sources in MediaPlayerImpl.
Andreas Huber [Wed, 4 Nov 2009 18:42:45 +0000 (10:42 -0800)]
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.
Andreas Huber [Wed, 4 Nov 2009 18:42:35 +0000 (10:42 -0800)]
am
2f133015: Merge change I5126e183 into eclair-mr2
Merge commit '
2f1330155153e590548e711d619765edc8ebb62f' into eclair-mr2-plus-aosp
* commit '
2f1330155153e590548e711d619765edc8ebb62f':
Fix MP3Extractor duration overflows...
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:27 +0000 (13:33 -0500)]
Merge change I6bce6d87 into eclair-mr2
* changes:
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:13 +0000 (13:33 -0500)]
Merge change I313953dc into eclair-mr2
* changes:
Support raw audio sources in MediaPlayerImpl.
Android (Google) Code Review [Wed, 4 Nov 2009 18:33:02 +0000 (13:33 -0500)]
Merge change I6f6bf3d8 into eclair-mr2
* changes:
Support raw audio sources in stagefright commandline tool.
Android (Google) Code Review [Wed, 4 Nov 2009 18:32:46 +0000 (13:32 -0500)]
Merge change I5126e183 into eclair-mr2
* changes:
Fix MP3Extractor duration overflows...
Android (Google) Code Review [Wed, 4 Nov 2009 16:49:25 +0000 (11:49 -0500)]
Merge change I6869df3a into eclair
* changes:
Add new audio sources to support the A1026 recording configurations.
Mike Lockwood [Wed, 4 Nov 2009 14:19:50 +0000 (06:19 -0800)]
am
6de8bbb0: am
27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '
6de8bbb00a6183c7d4eec76fa7f253cf80736422' into eclair-mr2-plus-aosp
* commit '
6de8bbb00a6183c7d4eec76fa7f253cf80736422':
PowerManagerService: Fix manual brightness mode.
Romain Guy [Wed, 4 Nov 2009 14:19:43 +0000 (06:19 -0800)]
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.
Mike Lockwood [Wed, 4 Nov 2009 14:10:37 +0000 (06:10 -0800)]
am
27c6dd7a: PowerManagerService: Fix manual brightness mode.
Merge commit '
27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-mr2
* commit '
27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
PowerManagerService: Fix manual brightness mode.
Romain Guy [Wed, 4 Nov 2009 14:10:26 +0000 (06:10 -0800)]
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.
Daisuke Miyakawa [Wed, 4 Nov 2009 13:02:50 +0000 (05:02 -0800)]
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.
Mathias Agopian [Wed, 4 Nov 2009 04:38:08 +0000 (20:38 -0800)]
fix [
2236832] software OpenGL ES driver doesn't work on sholes
make sure to not pass our fake handles to the real gralloc
Daisuke Miyakawa [Wed, 4 Nov 2009 00:22:18 +0000 (16:22 -0800)]
am
231e01e7: Merge change I202c3106 into eclair-mr2
Merge commit '
231e01e7922abae0b33f0aec95275a5cc1b0209d' into eclair-mr2-plus-aosp
* commit '
231e01e7922abae0b33f0aec95275a5cc1b0209d':
Make ContentValuesBuilder a separate file.
Leon Scroggins [Wed, 4 Nov 2009 00:22:10 +0000 (16:22 -0800)]
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.
Jason Sams [Wed, 4 Nov 2009 00:22:02 +0000 (16:22 -0800)]
am
a1c3681f: am
decc139b: Merge change I7a824efc into eclair
Merge commit '
a1c3681fb84e9baa3055709a18c635dc77c1b041' into eclair-mr2-plus-aosp
* commit '
a1c3681fb84e9baa3055709a18c635dc77c1b041':
Support applications changing the surface attached to the RS.
Android (Google) Code Review [Wed, 4 Nov 2009 00:13:07 +0000 (19:13 -0500)]
Merge change I202c3106 into eclair-mr2
* changes:
Make ContentValuesBuilder a separate file.
Android (Google) Code Review [Wed, 4 Nov 2009 00:03:17 +0000 (19:03 -0500)]
Merge change I33909a6a into eclair-mr2
* changes:
Do not scroll the title bar off screen until the page finishes loading.
Jason Sams [Wed, 4 Nov 2009 00:02:21 +0000 (16:02 -0800)]
am
decc139b: Merge change I7a824efc into eclair
Merge commit '
decc139b232721ea1b0521d144521c8082636f0c' into eclair-mr2
* commit '
decc139b232721ea1b0521d144521c8082636f0c':
Support applications changing the surface attached to the RS.
Android (Google) Code Review [Tue, 3 Nov 2009 23:56:03 +0000 (18:56 -0500)]
Merge change I7a824efc into eclair
* changes:
Support applications changing the surface attached to the RS.
Daisuke Miyakawa [Tue, 3 Nov 2009 23:42:06 +0000 (15:42 -0800)]
am
d14ea3c7: Merge change If338e940 into eclair-mr2
Merge commit '
d14ea3c7d7278695b9c51c243949de88cf38a1a4' into eclair-mr2-plus-aosp
* commit '
d14ea3c7d7278695b9c51c243949de88cf38a1a4':
Introduce ContentValuesBuilder and make tests easier to read.
Android (Google) Code Review [Tue, 3 Nov 2009 23:36:29 +0000 (18:36 -0500)]
Merge change If338e940 into eclair-mr2
* changes:
Introduce ContentValuesBuilder and make tests easier to read.
Amith Yamasani [Tue, 3 Nov 2009 23:31:59 +0000 (15:31 -0800)]
am
1283fd9e: am
86396f97: Merge changes Idcdd2978,Ied564b31,I6179126d into eclair
Merge commit '
1283fd9e7f6fc2f7b74f916ad3033ae1bdd1a76f' into eclair-mr2-plus-aosp
* commit '
1283fd9e7f6fc2f7b74f916ad3033ae1bdd1a76f':
Fix
2233444 (No IME).
Revert "Revert "Fix notification bar performance.""
Revert "Revert "fix
2233092 - Notification shade gets stuck half-open""
Amith Yamasani [Tue, 3 Nov 2009 23:26:12 +0000 (15:26 -0800)]
am
86396f97: Merge changes Idcdd2978,Ied564b31,I6179126d into eclair
Merge commit '
86396f97c998358390d912903395828ee244e2d5' into eclair-mr2
* commit '
86396f97c998358390d912903395828ee244e2d5':
Fix
2233444 (No IME).
Revert "Revert "Fix notification bar performance.""
Revert "Revert "fix
2233092 - Notification shade gets stuck half-open""
Mathias Agopian [Tue, 3 Nov 2009 23:21:00 +0000 (15:21 -0800)]
am
65ab88c7: am
21977eb0: Merge change I56981989 into eclair
Merge commit '
65ab88c78916d7e3a182125878b17c8f40d7cac5' into eclair-mr2-plus-aosp
* commit '
65ab88c78916d7e3a182125878b17c8f40d7cac5':
fix [
2231527] Compatibility with SpaceJunk game (OpenGL)
Jason Sams [Tue, 3 Nov 2009 23:20:53 +0000 (15:20 -0800)]
am
ebca5eec: am
83665194: Merge change I9d5e03db into eclair
Merge commit '
ebca5eec1c1e0a0cfc4ad25d1aacb1a3e30e44ef' into eclair-mr2-plus-aosp
* commit '
ebca5eec1c1e0a0cfc4ad25d1aacb1a3e30e44ef':
Fix RS bugs. We were holding a pointer to the script text from the java vm. Move freeing of objects to before context teardown to allow allocations to clean up their data.
Android (Google) Code Review [Tue, 3 Nov 2009 23:20:25 +0000 (18:20 -0500)]
Merge changes Idcdd2978,Ied564b31,I6179126d into eclair
* changes:
Fix
2233444 (No IME).
Revert "Revert "Fix notification bar performance.""
Revert "Revert "fix
2233092 - Notification shade gets stuck half-open""
Mathias Agopian [Tue, 3 Nov 2009 23:11:11 +0000 (15:11 -0800)]
am
21977eb0: Merge change I56981989 into eclair
Merge commit '
21977eb0f1d22497d0beed0492e579f953a56552' into eclair-mr2
* commit '
21977eb0f1d22497d0beed0492e579f953a56552':
fix [
2231527] Compatibility with SpaceJunk game (OpenGL)
Jason Sams [Tue, 3 Nov 2009 23:11:03 +0000 (15:11 -0800)]
am
83665194: Merge change I9d5e03db into eclair
Merge commit '
83665194abceeb7681cb7ac49a4b71aa6e96b1b1' into eclair-mr2
* commit '
83665194abceeb7681cb7ac49a4b71aa6e96b1b1':
Fix RS bugs. We were holding a pointer to the script text from the java vm. Move freeing of objects to before context teardown to allow allocations to clean up their data.
Android (Google) Code Review [Tue, 3 Nov 2009 23:04:49 +0000 (18:04 -0500)]
Merge change I56981989 into eclair
* changes:
fix [
2231527] Compatibility with SpaceJunk game (OpenGL)
Android (Google) Code Review [Tue, 3 Nov 2009 21:56:31 +0000 (16:56 -0500)]
Merge change I9d5e03db into eclair
* changes:
Fix RS bugs. We were holding a pointer to the script text from the java vm. Move freeing of objects to before context teardown to allow allocations to clean up their data.
Jason Parks [Tue, 3 Nov 2009 21:41:01 +0000 (13:41 -0800)]
am
2e6e80b9: am
c6e88afb: Merge change If2fdad3b into eclair
Merge commit '
2e6e80b9db0168ea69ba78088412e9ee4cb23a40' into eclair-mr2-plus-aosp
* commit '
2e6e80b9db0168ea69ba78088412e9ee4cb23a40':
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
Android Git Automerger [Tue, 3 Nov 2009 21:40:54 +0000 (13:40 -0800)]
am
c6b2d297: am
b96a9d92: Revert "fix
2233092 - Notification shade gets stuck half-open"
Merge commit '
c6b2d2970891790aa1c626a6f0d5ea39f5240161' into eclair-mr2-plus-aosp
* commit '
c6b2d2970891790aa1c626a6f0d5ea39f5240161':
Revert "fix
2233092 - Notification shade gets stuck half-open"
Android Git Automerger [Tue, 3 Nov 2009 21:40:46 +0000 (13:40 -0800)]
am
a3f84bb2: am
6e8f47b0: Revert "Fix notification bar performance."
Merge commit '
a3f84bb2f434d507c866e3e8c52e0817c00da958' into eclair-mr2-plus-aosp
* commit '
a3f84bb2f434d507c866e3e8c52e0817c00da958':
Revert "Fix notification bar performance."
Jason Parks [Tue, 3 Nov 2009 21:34:51 +0000 (13:34 -0800)]
am
c6e88afb: Merge change If2fdad3b into eclair
Merge commit '
c6e88afb3eda9da97f65b2a2f32e6a12c18301ba' into eclair-mr2
* commit '
c6e88afb3eda9da97f65b2a2f32e6a12c18301ba':
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
Android (Google) Code Review [Tue, 3 Nov 2009 21:29:22 +0000 (16:29 -0500)]
Merge change If2fdad3b into eclair
* changes:
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
Jason Parks [Tue, 3 Nov 2009 20:14:38 +0000 (12:14 -0800)]
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
Android Git Automerger [Tue, 3 Nov 2009 20:36:03 +0000 (12:36 -0800)]
am
b96a9d92: Revert "fix
2233092 - Notification shade gets stuck half-open"
Merge commit '
b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5' into eclair-mr2
* commit '
b96a9d9296925fef6a1c0e5ad4d847d96bf9acb5':
Revert "fix
2233092 - Notification shade gets stuck half-open"
Android Git Automerger [Tue, 3 Nov 2009 20:35:55 +0000 (12:35 -0800)]
am
6e8f47b0: Revert "Fix notification bar performance."
Merge commit '
6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de' into eclair-mr2
* commit '
6e8f47b0ed2ffdb55b695d9f154cccd3ea3c98de':
Revert "Fix notification bar performance."
Romain Guy [Tue, 3 Nov 2009 20:20:30 +0000 (12:20 -0800)]
am
4d7860d4: am
9ed30f93: Merge change I96444af2 into eclair
Merge commit '
4d7860d408d248aaebed973e7f774c02efc290f8' into eclair-mr2-plus-aosp
* commit '
4d7860d408d248aaebed973e7f774c02efc290f8':
Unhide View.isOpaque().
Romain Guy [Tue, 3 Nov 2009 20:15:11 +0000 (12:15 -0800)]
am
9ed30f93: Merge change I96444af2 into eclair
Merge commit '
9ed30f93f6149ede5885b9b8c0e22595876c6c84' into eclair-mr2
* commit '
9ed30f93f6149ede5885b9b8c0e22595876c6c84':
Unhide View.isOpaque().
Andreas Huber [Tue, 3 Nov 2009 20:10:27 +0000 (12:10 -0800)]
am
d6e54a90: am
338ccf43: Merge change Id2906ad8 into eclair
Merge commit '
d6e54a902368885072975dd0bad78dcd1cafaaea' into eclair-mr2-plus-aosp
* commit '
d6e54a902368885072975dd0bad78dcd1cafaaea':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.