Vasu Nori
5388e1c68d
Merge "fix broken logTimeStat stuff"
2011-03-21 15:52:43 -07:00
Romain Guy
8c0f7d28cb
Merge "Update GL textures when changing a Bitmap's pixels Bug #4146495 "
2011-03-21 15:31:00 -07:00
James Dong
78454b5dc3
Merge "Add read and write option in opening file for output in the writers"
2011-03-21 15:13:14 -07:00
Gloria Wang
45f3121a6a
Merge "Fix for 4084554. DRM framework support for enabling/disabling copy control settings from a DRM plugin"
2011-03-21 15:01:00 -07:00
Eric Laurent
e37f2c094d
Merge "Fix issue 3483718: audio streaming and A2DP."
2011-03-21 14:06:33 -07:00
Romain Guy
c894b57fa9
Merge "Add support for drawPoint() and drawPoints()."
2011-03-21 13:12:28 -07:00
Andreas Huber
3f7b924628
Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"
2011-03-21 11:23:15 -07:00
James Dong
74b3dc439a
Merge "Scale the thumbnail if display dimension is different from the actual buffer size"
2011-03-21 11:07:18 -07:00
Justin Ho
af424505c2
am 3f29ffa5: am 38cf000a: am 5e35c485: Updated 3G and wifi traffic indicators
...
* commit '3f29ffa56c5204fd3dc5587479b8a1c688665e41':
Updated 3G and wifi traffic indicators
2011-03-21 10:58:50 -07:00
Justin Ho
1ffa55568a
am 38cf000a: am 5e35c485: Updated 3G and wifi traffic indicators
...
* commit '38cf000a541206769ad7686936e49bf0c1e417b9':
Updated 3G and wifi traffic indicators
2011-03-21 10:56:41 -07:00
Justin Ho
a50dad82b5
am 5e35c485: Updated 3G and wifi traffic indicators
...
* commit '5e35c4855a972960403a10811882ebded8945006':
Updated 3G and wifi traffic indicators
2011-03-21 10:54:51 -07:00
Mike Lockwood
bfa1f89014
am 35fb9ea8: (-s ours) am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
...
* commit '35fb9ea84db148251973e1266904fd0949a6b2b1':
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:50:53 -07:00
Mike Lockwood
a184027848
am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
...
* commit '9a612b545e2c5249bfd8ef2b7673197b8f214cbd':
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:49:21 -07:00
Mike Lockwood
9de4c5825e
am 433567b5: am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
...
* commit '433567b57c96525fb6c1c39e8ccb9780548441ba':
UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:40:07 -07:00
Mike Lockwood
1b085405ba
am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
...
* commit '65de3c76874386a5c1ffd26690451ecdef972a9e':
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:37:33 -07:00
Mike Lockwood
764bc9df66
am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
...
* commit '56063c8d62d0574409a8150d580993c8d8e0f14f':
UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:33:01 -07:00
Mike Lockwood
ba33281a5f
am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
...
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:25:09 -07:00
Mike Lockwood
731d1353d3
Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
2011-03-20 17:08:24 -07:00
Jeff Brown
f3d6ab2ce7
Merge "Optimize EventHub to process events in big chunks."
2011-03-18 19:06:51 -07:00
Jeff Brown
966eed073e
Merge "Fix an incorrect NDK function prototype."
2011-03-18 18:52:40 -07:00
Jason Sams
a2001f1ffd
Merge "Fix cleanup bug clearing script references."
2011-03-18 17:43:10 -07:00
Jamie Gennis
3eb70b4a51
am bd340c7b: am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit 'bd340c7b492fcf7d0a6cccab8825e710c83fe76d':
SurfaceFlinger: Fix a typo.
2011-03-18 17:38:37 -07:00
Jamie Gennis
09bb22afae
am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
SurfaceFlinger: Fix a typo.
2011-03-18 17:36:51 -07:00
Jamie Gennis
560fe009e5
am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
SurfaceFlinger: Fix a typo.
2011-03-18 17:34:27 -07:00
Jamie Gennis
d32a694a0c
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
2011-03-18 17:32:25 -07:00
Svetoslav Ganov
ccd1c86b93
Merge "Text in accessibility events not consistent"
2011-03-18 17:16:14 -07:00
Romain Guy
1aee826614
Merge "Fix hairline rendering."
2011-03-18 17:15:12 -07:00
Jason Sams
f137a73050
Merge "Fix bug with hal init uninitialized var."
2011-03-18 17:10:09 -07:00
Eric Fischer
5c657f7e4e
am cfb05dc6: (-s ours) am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'cfb05dc67e4fd8c0c078d31bf5404ad915b80030':
Import revised translations. DO NOT MERGE
2011-03-18 16:58:44 -07:00
Eric Fischer
0c8f2bd227
am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '9ac8260608224f182ac5a20e50ce4352334a09ba':
Import revised translations. DO NOT MERGE
2011-03-18 16:53:45 -07:00
Romain Guy
60e8d2a082
Merge "Correctly apply filters to Alpha8 bitmaps."
2011-03-18 16:51:17 -07:00
Jamie Gennis
5fd799dab6
SurfaceFlinger: Fix a typo.
...
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.
Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
2011-03-18 16:35:13 -07:00
Svetoslav Ganov
f0af2b4404
Merge "ProgressBar does not fire accessibility events on update."
2011-03-18 16:26:41 -07:00
Romain Guy
c51ab3f545
Merge "Fix paths rendering issues."
2011-03-18 16:26:11 -07:00
Adam Powell
bc581b5a2a
Merge "Fix bug 4136005 - Extended menus do not work"
2011-03-18 16:16:43 -07:00
Eric Fischer
eefe09b7df
am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
2011-03-18 16:06:41 -07:00
Andreas Huber
9c9f264440
Merge "Squashed commit of the following:"
2011-03-18 16:03:40 -07:00
Russell Brenner
21b1cc0b64
am 2a102cce: (-s ours) am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit '2a102ccecdf2580d01847f09e6b431ce7e3bc8bc':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:51:00 -07:00
Russell Brenner
dee4e7fab1
am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit 'e68dc1576f2a27de17da41129778df331cda1f3f':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:34:49 -07:00
James Dong
b5f1151882
Merge "Better organize media recorder error and information event and types"
2011-03-18 15:33:11 -07:00
Russell Brenner
bd7b09f841
am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit 'a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:32:18 -07:00
Teng-Hui Zhu
fdafdb4fb3
am fa1b09a7: am eb52fb32: am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit 'fa1b09a7b3f546bd5b30233b1e3f62a6fa7d4a4b':
Asset for video poster
2011-03-18 15:30:34 -07:00
Russell Brenner
b36926abde
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491 " into honeycomb-mr1
2011-03-18 15:28:27 -07:00
Teng-Hui Zhu
f5c2f676e6
am eb52fb32: am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit 'eb52fb32297219efbd6add01586f06f32b260c58':
Asset for video poster
2011-03-18 15:27:22 -07:00
Eric Fischer
d2cd24d8ce
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-18 15:22:05 -07:00
Teng-Hui Zhu
3b9b781405
am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
Asset for video poster
2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
c53cb0d36c
Merge "Asset for video poster" into honeycomb-mr1
2011-03-18 15:19:28 -07:00
Svetoslav Ganov
a9a448efc4
Merge "DatePicker does not respect the user preference of date format"
2011-03-18 14:48:03 -07:00
Eric Laurent
693ef00d54
Merge "Fix issue 4111672: AudioTrack control block flags"
2011-03-18 14:43:41 -07:00
Romain Guy
bce3a5f51b
Merge "Optimize rect-shaped layers."
2011-03-18 14:37:48 -07:00