Neal Nguyen
7d9834ec81
am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
...
Merge commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp
* commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368':
Fixing some flakiness of some DL Manager tests.
2010-10-04 21:09:52 -07:00
Neal Nguyen
f39ed4b552
Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
2010-10-04 21:07:37 -07:00
Jeff Brown
2c7d39750c
am 79a3981e: Fix Looper leaks in MediaRecorderStressTest.
...
Merge commit '79a3981e3885b9144bb3d458682141eed7365939' into gingerbread-plus-aosp
* commit '79a3981e3885b9144bb3d458682141eed7365939':
Fix Looper leaks in MediaRecorderStressTest.
2010-10-04 21:05:02 -07:00
Mathias Agopian
8a4dfa9661
am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
...
Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp
* commit 'f461930872beb4362998642c115691bdd2e94617':
fix [2835280] Add support for cancelling buffers to ANativeWindow
2010-10-04 20:21:14 -07:00
Mathias Agopian
56b5c2861d
am ef115308: fix build. SurfaceView.setFrame needed to be hidden
...
Merge commit 'ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp
* commit 'ef11530874f86570aa04a10c16a416b274b3fdf5':
fix build. SurfaceView.setFrame needed to be hidden
2010-10-04 20:18:51 -07:00
Mathias Agopian
46b489f3d4
Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
2010-10-04 20:17:25 -07:00
Mathias Agopian
19957553cb
fix [2835280] Add support for cancelling buffers to ANativeWindow
...
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.
Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
2010-10-04 20:10:11 -07:00
Mathias Agopian
6263c831ec
am 19058877: Merge "refactored screenshot code" into gingerbread
...
Merge commit '19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp
* commit '19058877df9bf94f197a72855f810f7f6bf8d068':
refactored screenshot code
2010-10-04 20:06:51 -07:00
Mathias Agopian
d3f6ef560a
am b9aacfdf: Merge "new screencap command" into gingerbread
...
Merge commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59' into gingerbread-plus-aosp
* commit 'b9aacfdfb014cc0299f7999d2a8940cd60a4cc59':
new screencap command
2010-10-04 20:06:47 -07:00
Mathias Agopian
566b728c93
Merge "refactored screenshot code" into gingerbread
2010-10-04 20:04:42 -07:00
Mathias Agopian
7b8fda505e
Merge "new screencap command" into gingerbread
2010-10-04 20:04:37 -07:00
Adam Powell
3568e83037
am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
...
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp
* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
Fix bug 3061769
2010-10-04 19:59:35 -07:00
Adam Powell
e9a5488e1a
Merge "Fix bug 3061769" into gingerbread
2010-10-04 19:56:49 -07:00
Mathias Agopian
ff87f54349
am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
...
Merge commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3' into gingerbread-plus-aosp
* commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3':
fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-04 19:52:41 -07:00
Mathias Agopian
bfdc35dd45
Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
2010-10-04 19:50:16 -07:00
Christopher Tate
6997079565
Merge "Refinements to drag/drop"
2010-10-04 19:40:28 -07:00
Gil Dobjanschi
c9c5e224bc
Merge "Added mute APIs for MediaVideoItem and AudioTrack"
2010-10-04 19:04:36 -07:00
Elliott Hughes
465ec633d7
am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
...
Merge commit '7280f2155c37b00359c3fb050e2b067dcd74db40' into gingerbread-plus-aosp
* commit '7280f2155c37b00359c3fb050e2b067dcd74db40':
Manually revert a single-line error inserted by OpenJDK.
2010-10-04 18:55:32 -07:00
Elliott Hughes
58db5f304d
Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
2010-10-04 18:51:38 -07:00
Scott Main
cfb1390dcb
resolved conflicts for merge of 7008b7c1 to master
...
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
2010-10-04 18:42:49 -07:00
James Dong
126b49d939
am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
...
Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp
* commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
Fixed an issue where the reserved free space in the file writer was larger than intended
2010-10-04 18:39:52 -07:00
James Dong
e044dfb1de
Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
2010-10-04 18:37:48 -07:00
Nick Pelly
e26f5e72cf
am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
...
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp
* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
New API stubs: NdefMessage and NdefRecord.
2010-10-04 18:27:27 -07:00
Patrick Dubroy
43f32e7583
am 242fa52b: am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
...
Merge commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270'
* commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270':
Fix 2-pixel offset unlock jog tab
2010-10-04 18:23:44 -07:00
Nick Pelly
377bf20f79
Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
2010-10-04 18:21:57 -07:00
Gilles Debunne
910e71b6f4
am 52810607: Revert "Restored ic_dialog_menu_generic asset."
...
Merge commit '528106070b6622e82fd22783007f6dbc29b96701' into gingerbread-plus-aosp
* commit '528106070b6622e82fd22783007f6dbc29b96701':
Revert "Restored ic_dialog_menu_generic asset."
2010-10-04 18:13:34 -07:00
Gilles Debunne
c752ddf0ae
am e91398d1: Revert for 68833 and 68483 which introduced new assets instead of just updating.
...
Merge commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88' into gingerbread-plus-aosp
* commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88':
Revert for 68833 and 68483 which introduced new assets instead of just updating.
2010-10-04 17:53:55 -07:00
Gil Dobjanschi
03ce5e9a82
Merge "Save AudioTrack to XML"
2010-10-04 17:52:43 -07:00
Mathias Agopian
df85c455c3
refactored screenshot code
...
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.
we also now have some client code to interface with the screenshot service.
it's now possible to request a screenshot at a lower resolution.
Change-Id: I33689bba98507ab928d0898b21596d0d2fe4b953
2010-10-04 17:36:17 -07:00
Romain Guy
5a9be87d7d
Merge "Remove logs to reduce logcat spam."
2010-10-04 17:24:21 -07:00
Chet Haase
d6fae037b8
Merge "Changed LayoutTransition to disable animations when set to null"
2010-10-04 17:16:03 -07:00
Romain Guy
fea26a72f1
Merge "Reorder logs."
2010-10-04 17:15:15 -07:00
Kenny Root
2a877ed73a
am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
...
Merge commit 'f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp
* commit 'f84a5918f5e0572c0280fa705970ef7459b45393':
Use pread() in ZipFileRO for Linux
2010-10-04 17:12:10 -07:00
Kenny Root
085996210c
Merge "Use pread() in ZipFileRO for Linux" into gingerbread
2010-10-04 17:08:26 -07:00
Gilles Debunne
64e8d24969
am c37eac24: Restored ic_dialog_menu_generic asset.
...
Merge commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp
* commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5':
Restored ic_dialog_menu_generic asset.
2010-10-04 17:03:25 -07:00
Gilles Debunne
6ce2e6e4bc
am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
...
Merge commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp
* commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee':
DO NOT MERGE. Select word no longer selects spaces between words.
2010-10-04 16:45:32 -07:00
Gilles Debunne
250b2c9c16
Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
2010-10-04 16:42:40 -07:00
Scott Main
39aac03b9b
am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement
...
Merge commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88' into gingerbread-plus-aosp
* commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88':
docs: update homepage with more countries for market announcement
2010-10-04 16:35:18 -07:00
Scott Main
37c5dc049c
am 46ffeb21: docs: update homepage with more countries for market announcement
...
Merge commit '46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread
* commit '46ffeb218859a543540a70b3229a48d2d96cbb4a':
docs: update homepage with more countries for market announcement
2010-10-04 16:31:47 -07:00
Gilles Debunne
ff5e2fddb3
Merge "resolved conflicts for merge of 242fa52b to master"
2010-10-04 16:01:22 -07:00
Gil Dobjanschi
5110891a53
Merge "Added audio track playback API"
2010-10-04 15:49:26 -07:00
Scott Main
0f77061f38
am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
...
Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp
* commit 'b3a5b85a612703e54e631ffab5bb518eba909899':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 15:49:07 -07:00
James Dong
90c9df0582
am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
...
Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp
* commit 'b99f0c7eae365f788a21944fef28de580c7f5f92':
Resilent media time stamp adjustment
2010-10-04 15:48:59 -07:00
Gilles Debunne
efb078ff61
am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
...
Merge commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp
* commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b':
Removed icon in Alert dialog header.
2010-10-04 15:48:54 -07:00
Adam Powell
aec6b516c5
am 368733b2: Remove overscroll_edge.png from drawable/
...
Merge commit '368733b204805cfa716897b09153350a70dca3f3' into gingerbread-plus-aosp
* commit '368733b204805cfa716897b09153350a70dca3f3':
Remove overscroll_edge.png from drawable/
2010-10-04 15:48:50 -07:00
Adam Powell
e5ada36d2b
am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
...
Merge commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp
* commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9':
Fix bug 3052686 - ScrollView padding treated incorrectly
2010-10-04 15:48:37 -07:00
Scott Main
72f5d5b949
am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
...
Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread
* commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 15:39:24 -07:00
James Dong
4576b09a11
Merge "Resilent media time stamp adjustment" into gingerbread
2010-10-04 15:35:40 -07:00
Gilles Debunne
721a4020a7
Merge "Removed icon in Alert dialog header." into gingerbread
2010-10-04 15:34:43 -07:00
Adam Powell
27a0b636ac
Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
2010-10-04 15:24:29 -07:00