Erik Gilling
980b38d2f5
Merge "surfaceflinger: give hwcomposer a chance to release buffers"
2010-09-09 13:01:27 -07:00
Erik Gilling
4b95ea0153
Merge "surfaceflinger: composite HWC_SKIP_LAYER layers"
2010-09-09 13:01:23 -07:00
Erik Gilling
1d3fc50ac0
Merge "surfaceflinger: unlock clients only after flip"
2010-09-09 13:01:18 -07:00
Adam Powell
14fdda3196
Merge "Fix bug 2988160 - Flinging broken in certain apps/widgets"
2010-09-09 12:26:16 -07:00
Adam Powell
8ae0f3f6c7
Fix bug 2988160 - Flinging broken in certain apps/widgets
...
Change-Id: I89de767cecbbc37cb2fe90a0346e8e1591dec60b
2010-09-09 12:17:54 -07:00
Antti Hatala
11042a41c1
surfaceflinger: give hwcomposer a chance to release buffers
...
Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
2010-09-09 12:06:48 -07:00
Antti Hatala
982f58bdcc
surfaceflinger: composite HWC_SKIP_LAYER layers
...
Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
2010-09-09 12:06:31 -07:00
Antti Hatala
4c0a4a2b74
surfaceflinger: unlock clients only after flip
...
Change-Id: I039291a36f05bbaa02b29325d4012114abd784b9
2010-09-09 12:06:18 -07:00
Gilles Debunne
a78eca95ff
Merge "Progress Dialog documentation example uses onPrepareDialog"
2010-09-09 11:56:11 -07:00
Romain Guy
a5682df238
Merge "Do not convert 8888 bitmaps to 565 when doing a copy."
2010-09-09 11:52:02 -07:00
Romain Guy
d90f23e24a
Do not convert 8888 bitmaps to 565 when doing a copy.
...
Bug #2988077
This change keeps the 8888 format for new bitmaps and also keeps,
when possible, the opaque flag.
Change-Id: Ia61f2e89936916b329212a4c59a7d815c329f84e
2010-09-09 11:47:54 -07:00
Gilles Debunne
12f9415b02
Merge "Smart word detection in text selection. Manual merge in HC of 63569."
2010-09-09 10:51:57 -07:00
Romain Guy
c804b27d11
Merge "A Path can exist in several cache entries."
2010-09-09 10:14:33 -07:00
Romain Guy
183f17e7eb
A Path can exist in several cache entries.
...
Change-Id: I742f7425d2b6bef753ed3e04fb39ebb103b2dc00
2010-09-09 10:13:31 -07:00
Gilles Debunne
03789e8d59
Smart word detection in text selection. Manual merge in HC of 63569.
...
Selecting between words selects the spaces instead of the closest word, facilitating
paste insertion vs word replacement.
Pasting adds/removes space before and after if needed so that pasted text is not appended to
existing text.
Change-Id: Iffa0fb573d3535af72b639d05c5dc0721e80bda5
2010-09-09 10:03:42 -07:00
Gilles Debunne
6e1df0e981
Progress Dialog documentation example uses onPrepareDialog
...
Change-Id: I7afebdb321e28d8e4b1687ba4f503bde7d6031a0
2010-09-09 09:21:53 -07:00
Mike Lockwood
8624e6399d
Merge "Add framework resource to specify case sensitivity of the external storage filesystem"
2010-09-09 08:28:53 -07:00
Mike Lockwood
f73738b78a
Add framework resource to specify case sensitivity of the external storage filesystem
...
Change-Id: I8a433de9188c32214b1f8d6a4490dfe731d68c40
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 09:58:24 -04:00
Chia-chi Yeh
3384e0f69b
am c2eff4a7: am f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
...
Merge commit 'c2eff4a71bd3ab75983ffd029123f10bc177d32a'
* commit 'c2eff4a71bd3ab75983ffd029123f10bc177d32a':
RTP: prevent buffer overflow in AudioRecord.
2010-09-09 02:44:04 -07:00
Chia-chi Yeh
c2eff4a71b
am f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
...
Merge commit 'f6936a3a52b6bb6de27f75d4e38d116e896b7f4d' into gingerbread-plus-aosp
* commit 'f6936a3a52b6bb6de27f75d4e38d116e896b7f4d':
RTP: prevent buffer overflow in AudioRecord.
2010-09-09 02:39:58 -07:00
Chia-chi Yeh
f6936a3a52
Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread
2010-09-09 02:37:07 -07:00
Chung-yih Wang
98093a9418
am b2118252: am 4d1e0121: Change the keep-alive interval to 10 seconds.
...
Merge commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69'
* commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69':
Change the keep-alive interval to 10 seconds.
2010-09-08 22:47:30 -07:00
Chung-yih Wang
b211825254
am 4d1e0121: Change the keep-alive interval to 10 seconds.
...
Merge commit '4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp
* commit '4d1e0121277b566b5e1c22e790a3b607b75d945d':
Change the keep-alive interval to 10 seconds.
2010-09-08 22:42:52 -07:00
Chung-yih Wang
4d1e012127
Change the keep-alive interval to 10 seconds.
...
Change-Id: I216cee622f57ee18533de3960d4da1a41e01f1ae
2010-09-09 13:27:10 +08:00
Adam Powell
079fd1c0a3
Make action buttons more style-based
...
Change-Id: Ia7ef4da8d8004f1b3809b4883aafc541695d235a
2010-09-08 21:40:54 -07:00
Neal Nguyen
1e3187c27f
am 0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp
...
Merge commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911'
* commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911':
Adding Download Manager Integration, stress, and hosts-based tests.
2010-09-08 20:26:50 -07:00
Neal Nguyen
0c592acfc0
Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp
2010-09-08 20:23:43 -07:00
Mathias Agopian
515d2c1e95
am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread
...
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'
* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
add a fps counter to sanangeles demo
2010-09-08 19:04:07 -07:00
Mathias Agopian
099aa9a1b4
am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread
...
Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp
* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
add a fps counter to sanangeles demo
2010-09-08 19:01:37 -07:00
Mathias Agopian
edbb8083a8
Merge "add a fps counter to sanangeles demo" into gingerbread
2010-09-08 18:57:42 -07:00
Mathias Agopian
ce8f54942b
add a fps counter to sanangeles demo
...
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
2010-09-08 18:55:42 -07:00
Dirk Dougherty
54ceb6e68e
am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
...
Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50'
* commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
2010-09-08 18:22:33 -07:00
Dirk Dougherty
eed5d17d78
am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
...
Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp
* commit 'ea68cab8a33d3169de33c7112000cd3dae233afe':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
2010-09-08 18:14:04 -07:00
Romain Guy
9584a542e3
Merge "Purge Skia objects from GL caches as needed."
2010-09-08 18:06:11 -07:00
Dirk Dougherty
ea68cab8a3
am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
...
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread
* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
2010-09-08 18:05:58 -07:00
Romain Guy
a2341a9f6a
Purge Skia objects from GL caches as needed.
...
Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
2010-09-08 18:04:33 -07:00
James Dong
e3aa6aa770
am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
...
Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'
* commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334':
HW audio encoder expects timestamp via kKeyTime from each input buffer
2010-09-08 17:57:56 -07:00
James Dong
306cd58ddc
am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
...
Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp
* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
HW audio encoder expects timestamp via kKeyTime from each input buffer
2010-09-08 17:54:28 -07:00
Dirk Dougherty
3eb07ea483
Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo
2010-09-08 17:52:45 -07:00
James Dong
d353c840ad
Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
2010-09-08 17:51:59 -07:00
Mike LeBeau
1383158687
am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
...
Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9'
* commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9':
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
2010-09-08 17:49:34 -07:00
Mike LeBeau
573c5d5edc
am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
...
Merge commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp
* commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
2010-09-08 17:46:22 -07:00
Chet Haase
b149f57d5e
Merge "Fix bug with LayoutTransition when layouts are just coming on line"
2010-09-08 17:44:39 -07:00
Adam Cohen
3bdc7209b1
Merge "AdapterViewAnimator now properly handles notifyDataSetChanged"
2010-09-08 17:43:17 -07:00
Mike LeBeau
46b84d5b4a
Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread
2010-09-08 17:43:15 -07:00
Mike LeBeau
2fe6fd0558
Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
...
search and play of music. This is used, for instance, by Google's
new "listen to" Voice Action.
Change-Id: Ibbc81701cc2412ffd57402d34f22d9764e9df7c2
2010-09-08 20:39:05 -04:00
James Dong
d015ccf62b
HW audio encoder expects timestamp via kKeyTime from each input buffer
...
- This fixes media server crashes on droid
Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
2010-09-08 17:28:57 -07:00
Eric Laurent
15ff01cdb4
am e126119c: am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread
...
Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d'
* commit 'e126119c3a406bc564f2549aeb1416aff112689d':
Modify type of some environmental reverb parameters
2010-09-08 17:22:54 -07:00
Eric Laurent
e126119c3a
am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread
...
Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp
* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
Modify type of some environmental reverb parameters
2010-09-08 17:19:43 -07:00
Eric Laurent
95d8648054
Merge "Modify type of some environmental reverb parameters" into gingerbread
2010-09-08 17:17:38 -07:00