Evan Millar
bc9052a372
am bce8f5f3: am 97c5a993: am 326eaa33: Merge change I0fae86b8 into eclair
...
Merge commit 'bce8f5f3a0b262c469fa3169175d6ca004f418ff'
* commit 'bce8f5f3a0b262c469fa3169175d6ca004f418ff':
Make QuickContact styles public.
2009-11-03 11:19:29 -08:00
Evan Millar
bce8f5f3a0
am 97c5a993: am 326eaa33: Merge change I0fae86b8 into eclair
...
Merge commit '97c5a993446b2da6bd45bf36bef1fa1268332749' into eclair-mr2-plus-aosp
* commit '97c5a993446b2da6bd45bf36bef1fa1268332749':
Make QuickContact styles public.
2009-11-03 11:13:58 -08:00
Evan Millar
97c5a99344
am 326eaa33: Merge change I0fae86b8 into eclair
...
Merge commit '326eaa334da566c3dcae29b17f255c63c8bb919a' into eclair-mr2
* commit '326eaa334da566c3dcae29b17f255c63c8bb919a':
Make QuickContact styles public.
2009-11-03 11:04:53 -08:00
Android (Google) Code Review
326eaa334d
Merge change I0fae86b8 into eclair
...
* changes:
Make QuickContact styles public.
2009-11-03 13:58:03 -05:00
Eric Laurent
76363ea3ee
am 7fc9343c: am 62174d02: am 65e4f618: Merge change I60bed5d3 into eclair
...
Merge commit '7fc9343c33dc5b97963dcd0a2e46d391ec333985'
* commit '7fc9343c33dc5b97963dcd0a2e46d391ec333985':
Log for issue 2203561.
2009-11-03 10:48:36 -08:00
Eric Laurent
7fc9343c33
am 62174d02: am 65e4f618: Merge change I60bed5d3 into eclair
...
Merge commit '62174d022b9018d92fc180a576bd12c13681c76e' into eclair-mr2-plus-aosp
* commit '62174d022b9018d92fc180a576bd12c13681c76e':
Log for issue 2203561.
2009-11-03 10:43:33 -08:00
Eric Laurent
62174d022b
am 65e4f618: Merge change I60bed5d3 into eclair
...
Merge commit '65e4f6188bfc8ec3c9d1c8476953cd1beb7922bc' into eclair-mr2
* commit '65e4f6188bfc8ec3c9d1c8476953cd1beb7922bc':
Log for issue 2203561.
2009-11-03 10:33:01 -08:00
Android (Google) Code Review
65e4f6188b
Merge change I60bed5d3 into eclair
...
* changes:
Log for issue 2203561.
2009-11-03 13:23:55 -05:00
Mike Lockwood
dbe7537647
am 44795bc2: am 0ce9c58f: am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair
...
Merge commit '44795bc2be71428dac7557468f24f71b7857a8f7'
* commit '44795bc2be71428dac7557468f24f71b7857a8f7':
Remove obsolete hardware auto-brightness support.
Add documentation for proximity and light sensors.
2009-11-03 10:04:27 -08:00
Joe Onorato
21447adf7f
am 5e2cd87f: am 564fe1ba: am 6a7899a8: fix 2233092 - Notification shade gets stuck half-open
...
Merge commit '5e2cd87f0964938736888c84cfe8e734e418758a'
* commit '5e2cd87f0964938736888c84cfe8e734e418758a':
fix 2233092 - Notification shade gets stuck half-open
2009-11-03 10:04:17 -08:00
Mathias Agopian
55ab1c002d
am d1d744cd: am 07d38c66: am 8637759a: Merge change I36d0184e into eclair
...
Merge commit 'd1d744cdf4b08c8ef969790bae305c82ae783f4e'
* commit 'd1d744cdf4b08c8ef969790bae305c82ae783f4e':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
2009-11-03 10:04:07 -08:00
Evan Millar
0fae86b80f
Make QuickContact styles public.
...
This should have been done for the 2.0 sdk, but fell through the cracks.
Fortunately this will make it into the 2.1 sdk.
2009-11-03 09:49:43 -08:00
Mike Lockwood
44795bc2be
am 0ce9c58f: am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair
...
Merge commit '0ce9c58fe33a3b96219944762adbff99d12212a3' into eclair-mr2-plus-aosp
* commit '0ce9c58fe33a3b96219944762adbff99d12212a3':
Remove obsolete hardware auto-brightness support.
Add documentation for proximity and light sensors.
2009-11-03 09:47:47 -08:00
Joe Onorato
5e2cd87f09
am 564fe1ba: am 6a7899a8: fix 2233092 - Notification shade gets stuck half-open
...
Merge commit '564fe1ba091f816f03cfae4dbdebcc7df22ae7f9' into eclair-mr2-plus-aosp
* commit '564fe1ba091f816f03cfae4dbdebcc7df22ae7f9':
fix 2233092 - Notification shade gets stuck half-open
2009-11-03 09:47:39 -08:00
Mathias Agopian
d1d744cdf4
am 07d38c66: am 8637759a: Merge change I36d0184e into eclair
...
Merge commit '07d38c66692b7d87415667010c0658202b5a7f39' into eclair-mr2-plus-aosp
* commit '07d38c66692b7d87415667010c0658202b5a7f39':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
2009-11-03 09:47:31 -08:00
Mike Lockwood
0ce9c58fe3
am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair
...
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-mr2
* commit 'd2c68794364120d0531667e797f078416ebef3f5':
Remove obsolete hardware auto-brightness support.
Add documentation for proximity and light sensors.
2009-11-03 09:37:50 -08:00
Joe Onorato
564fe1ba09
am 6a7899a8: fix 2233092 - Notification shade gets stuck half-open
...
Merge commit '6a7899a8d6444989657d1058666269263b5b50c0' into eclair-mr2
* commit '6a7899a8d6444989657d1058666269263b5b50c0':
fix 2233092 - Notification shade gets stuck half-open
2009-11-03 09:34:48 -08:00
Mathias Agopian
07d38c6669
am 8637759a: Merge change I36d0184e into eclair
...
Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-mr2
* commit '8637759a1d34a4adda292579d5f8790587659235':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
2009-11-03 09:34:40 -08:00
Eric Laurent
f4ee40e26e
Log for issue 2203561.
...
Implemented AudioPolicyService dump().
Added detailed dump for AudioPolicyManageriGeneric when AudioPolicyService is dumped.
2009-11-03 09:33:35 -08:00
Android (Google) Code Review
d2c6879436
Merge changes I116424c4,Ibd0ef67f into eclair
...
* changes:
Remove obsolete hardware auto-brightness support.
Add documentation for proximity and light sensors.
2009-11-03 12:32:04 -05:00
Joe Onorato
6a7899a8d6
fix 2233092 - Notification shade gets stuck half-open
...
Follow up to bug 2195678. This was one of the reprocussions that
I was worried about with respect to that bug, so I'm counting
Dr. No on that change as the one for this one.
2009-11-03 12:22:33 -05:00
Mike Lockwood
f90ffcc639
Remove obsolete hardware auto-brightness support.
...
Change-Id: Ibd0ef67f887254f26ce19faf0627f8b246ec0a18
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-03 11:41:27 -05:00
Mike Lockwood
4115c51875
Add documentation for proximity and light sensors.
...
Change-Id: I116424c468d1d3afe89e0e17be773ee8b80ada92
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-03 10:36:24 -05:00
Daisuke Miyakawa
931b83e727
am c4bbb914: am 6cb76ac3: Rename the term "attribute"/"attr" to "parameter"/param".
...
Merge commit 'c4bbb9144d1955340d69548e7245417cbe862d3c'
* commit 'c4bbb9144d1955340d69548e7245417cbe862d3c':
Rename the term "attribute"/"attr" to "parameter"/param".
2009-11-03 01:07:46 -08:00
Daisuke Miyakawa
c4bbb9144d
am 6cb76ac3: Rename the term "attribute"/"attr" to "parameter"/param".
...
Merge commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5' into eclair-mr2-plus-aosp
* commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5':
Rename the term "attribute"/"attr" to "parameter"/param".
2009-11-03 00:58:16 -08:00
Daisuke Miyakawa
6cb76ac37f
Rename the term "attribute"/"attr" to "parameter"/param".
...
We had been using "parameter"/"param" by mistake, while both vCard
formats uses theterm "attribute"/"attr". This is confusing.
Internal issue number: 2233884
2009-11-03 17:30:19 +09:00
Daisuke Miyakawa
f1072c568e
am e7a5141c: am 66da163d: Move some useful logic to VCardTestsBase.java
...
Merge commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a'
* commit 'e7a5141c0db324ab17b0b5f316463cc8a6a3c36a':
Move some useful logic to VCardTestsBase.java
2009-11-03 00:10:08 -08:00
Dirk Dougherty
3bb6baa349
am 759ac9e3: am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4'
* commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4':
doc change: misc doc fixes.
2009-11-03 00:09:57 -08:00
Daisuke Miyakawa
e7a5141c0d
am 66da163d: Move some useful logic to VCardTestsBase.java
...
Merge commit '66da163d4115688a8be7abb96c409a9858f9a8cd' into eclair-mr2-plus-aosp
* commit '66da163d4115688a8be7abb96c409a9858f9a8cd':
Move some useful logic to VCardTestsBase.java
2009-11-03 00:04:43 -08:00
Daisuke Miyakawa
66da163d41
Move some useful logic to VCardTestsBase.java
...
Internal issue number: 2195990
2009-11-03 16:53:58 +09:00
Dirk Dougherty
759ac9e3da
am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp
* commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e':
doc change: misc doc fixes.
2009-11-02 18:29:52 -08:00
Android (Google) Code Review
8637759a1d
Merge change I36d0184e into eclair
...
* changes:
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
2009-11-02 21:26:54 -05:00
Dirk Dougherty
21cbd52b7a
am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-mr2
* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
doc change: misc doc fixes.
2009-11-02 18:24:29 -08:00
Dirk Dougherty
483d29c0dd
am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
...
Merge commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b' into eclair
* commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b':
doc change: misc doc fixes.
2009-11-02 18:17:26 -08:00
Android (Google) Code Review
671c61d66f
Merge change Iaf5d2cc2 into eclair-sdk
...
* changes:
doc change: misc doc fixes.
2009-11-02 21:05:30 -05:00
Mathias Agopian
36d0184e08
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
...
we lost the concept of vertical stride when moving video playback to EGLImage.
Here we bring it back in a somewhat hacky-way that will work only for the
softgl/mdp backend.
2009-11-02 17:48:33 -08:00
James Dong
ffca760612
am 76370140: am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair
...
Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'
* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:46:36 -08:00
Brett Chabot
56c93389a2
am f13b7c7f: (-s ours) am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
...
Merge commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8'
* commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8':
Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 17:46:21 -08:00
Brett Chabot
a98c5675d2
am 64e648fd: am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair
...
Merge commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1'
* commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:46:12 -08:00
Dima Zavin
7a889a37be
am 8559ca18: am 0a5201f0: am dfc7244a: libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
...
Merge commit '8559ca18de9cdd60bd8979e641c4fd1a8e66b62e'
* commit '8559ca18de9cdd60bd8979e641c4fd1a8e66b62e':
libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
2009-11-02 17:46:03 -08:00
Jesse Wilson
fcca5a95e6
Another round of API xml changes for the piped streams change
2009-11-02 17:38:23 -08:00
James Dong
763701408b
am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair
...
Merge commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8' into eclair-mr2-plus-aosp
* commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8':
Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:27:54 -08:00
Brett Chabot
f13b7c7f7c
am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
...
Merge commit '4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7' into eclair-mr2-plus-aosp
* commit '4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7':
Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 17:20:30 -08:00
Brett Chabot
64e648fdd9
am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair
...
Merge commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e' into eclair-mr2-plus-aosp
* commit 'b580d53e7517e6020ee42c4f0fcda21bf381c74e':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:20:08 -08:00
James Dong
9d4dcf287c
am f67eff17: Merge change Ib0036762 into eclair
...
Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2
* commit 'f67eff177515baa421d8717ee20efdc516fde580':
Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:19:51 -08:00
Brett Chabot
4aa7e0aae1
am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
...
Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-mr2
* commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80':
Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 17:15:02 -08:00
Brett Chabot
b580d53e75
am 774d956d: Merge change Ic8c7ca7b into eclair
...
Merge commit '774d956d5d2f6bece15c10c0db275596148c7ef8' into eclair-mr2
* commit '774d956d5d2f6bece15c10c0db275596148c7ef8':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:14:54 -08:00
Android (Google) Code Review
f67eff1775
Merge change Ib0036762 into eclair
...
* changes:
Add windows media support check in MediaMetadataRetrieverTest bug 2232274
2009-11-02 20:13:20 -05:00
Dima Zavin
8559ca18de
am 0a5201f0: am dfc7244a: libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
...
Merge commit '0a5201f01cac963752e0b4635f081c73cb6f1959' into eclair-mr2-plus-aosp
* commit '0a5201f01cac963752e0b4635f081c73cb6f1959':
libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
2009-11-02 17:10:13 -08:00
Android (Google) Code Review
d6af2e0cbf
Merge change I43a335c3 into eclair
...
* changes:
Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 20:08:16 -05:00