Mathias Agopian
7710e2f8c6
am f0533365: Merge "make sure to ignore SIGPIPE in the write side of BitTube"
...
* commit 'f0533365dc1c89253a551a77fbc987568bb8e650':
make sure to ignore SIGPIPE in the write side of BitTube
2012-02-06 19:20:42 -08:00
Mathias Agopian
f0533365dc
Merge "make sure to ignore SIGPIPE in the write side of BitTube"
2012-02-06 19:18:57 -08:00
Mathias Agopian
efa08a6c21
make sure to ignore SIGPIPE in the write side of BitTube
...
Change-Id: If4f037f4403d3ecbcd5f91248354765fc0fa13cb
2012-02-06 19:17:56 -08:00
Alex Sakhartchouk
543fbd26f2
Merge "Streamlining texture creation. Adding render target textureas. Adding texture params for shaders. Making it easier to bind root script." into graphics-dev
2012-02-06 19:16:33 -08:00
Alex Sakhartchouk
6dd7f5ea92
Merge "Fixes to simplify programmatic creation." into graphics-dev
2012-02-06 19:15:20 -08:00
Alex Sakhartchouk
e8bb420a68
Streamlining texture creation.
...
Adding render target textureas.
Adding texture params for shaders.
Making it easier to bind root script.
Change-Id: I96dfc6ffba8bb7391d03a84682c43c82387e0be3
2012-02-06 19:13:47 -08:00
Xavier Ducrohet
7207389fe2
am 0c34c14a: Merge "Fix a setBackgroundDrawable in layoutlib."
...
* commit '0c34c14a17af0e90086f674f6a4d510673e250c8':
Fix a setBackgroundDrawable in layoutlib.
2012-02-06 18:09:43 -08:00
Xavier Ducrohet
0c34c14a17
Merge "Fix a setBackgroundDrawable in layoutlib."
2012-02-06 18:07:21 -08:00
Xavier Ducrohet
c8a0b8e6bc
Fix a setBackgroundDrawable in layoutlib.
...
Change-Id: Id5f3ec8cc6863fa5929743ef4014c331633efce9
2012-02-06 17:29:19 -08:00
Fabrice Di Meglio
e3e0e28076
am 61241256: Merge "Fix bug #5968466 system running out of memory during WebView performance test"
...
* commit '61241256985d72cd4ff7673eea275aacb82d6cf9':
Fix bug #5968466 system running out of memory during WebView performance test
2012-02-06 17:25:20 -08:00
Fabrice Di Meglio
91ec688502
am f531a800: Merge "Update BiDiTest app for adding GridLayout unit tests"
...
* commit 'f531a800754d6af5c04ee50f15db1ceb00897bb1':
Update BiDiTest app for adding GridLayout unit tests
2012-02-06 17:23:13 -08:00
Fabrice Di Meglio
6124125698
Merge "Fix bug #5968466 system running out of memory during WebView performance test"
2012-02-06 17:22:06 -08:00
Fabrice Di Meglio
f531a80075
Merge "Update BiDiTest app for adding GridLayout unit tests"
2012-02-06 17:21:40 -08:00
Fabrice Di Meglio
bf2ab0b80c
Update BiDiTest app for adding GridLayout unit tests
...
- added basic GridLayout unit tests for LTR / RTL / Locale cases
Change-Id: Ied9814b2f56acb5d3666e78ad600f487ce4dc911
2012-02-06 17:20:25 -08:00
John Wang
818b93936f
am c70969ea: am a0da8adf: am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit 'c70969ea5cf8021635be1fdb5074e4fb3cb928f0':
2012-02-06 17:09:35 -08:00
John Wang
fac9bb5ee6
am 17cbdd39: am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '17cbdd39ea0319ca2d50ab6ee4b5733312417ec6':
Don't use SNR in the invalid check.
2012-02-06 17:09:33 -08:00
Craig Mautner
6d96fd052d
am a52b6e7b: Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
...
* commit 'a52b6e7bcf5ee6e80a4443f19b31a3df0ec4e518':
Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods.
2012-02-06 17:07:27 -08:00
John Wang
c70969ea5c
am a0da8adf: am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit 'a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':
2012-02-06 17:06:18 -08:00
John Wang
17cbdd39ea
am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '7e6295b32310afddccf5fb030d4c475ed3678e0f':
Don't use SNR in the invalid check.
2012-02-06 17:06:16 -08:00
Tom Taylor
b764157cff
am 429cf48e: Merge "CrespoMMS appears after delay in the thread"
...
* commit '429cf48e2c777cc72925955d7943091b3cf3e181':
CrespoMMS appears after delay in the thread
2012-02-06 17:05:16 -08:00
John Wang
a0da8adf55
am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':
2012-02-06 17:04:42 -08:00
Craig Mautner
a52b6e7bcf
Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
2012-02-06 17:04:23 -08:00
John Wang
7e6295b323
am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
Don't use SNR in the invalid check.
2012-02-06 17:04:11 -08:00
Tom Taylor
429cf48e2c
Merge "CrespoMMS appears after delay in the thread"
2012-02-06 17:03:34 -08:00
John Wang
397d3ffcbd
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
2012-02-06 17:03:15 -08:00
John Wang
9ad528d51c
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
2012-02-06 17:02:30 -08:00
John Wang
48ac0f14de
Merge "Don't use SNR in the invalid check." into ics-mr1
2012-02-06 17:00:49 -08:00
Tom Taylor
3b259a0963
CrespoMMS appears after delay in the thread
...
Bug 5032682
Part A of several parts to speed up sending MMS's. In this change, don't
allow multiple threads to write out the same pdu at the same time. This
was causing problems between the thread sending the mms message and the
UI trying to refresh and display the in-progress-sending message.
Change-Id: I862081619e6b6808caaba86a3b48820e0ef75aba
2012-02-06 16:57:39 -08:00
Craig Mautner
61ac6bb250
Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods.
...
Change-Id: I80152c38741ce73b92da9483cfed84efbac34f89
2012-02-06 16:52:16 -08:00
Xavier Ducrohet
2995d4449e
am 0a599632: am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit '0a59963287f6a54eaf7ff5110474b02713502f9a':
2012-02-06 16:51:04 -08:00
Xavier Ducrohet
0a59963287
am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit '82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':
2012-02-06 16:48:55 -08:00
Xavier Ducrohet
b84a50eea5
am e1ce916e: am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit 'e1ce916e0029d72ddbf7476efd4993c7301ec784':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
2012-02-06 16:48:48 -08:00
Xavier Ducrohet
e1ce916e00
am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit 'c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
2012-02-06 16:46:46 -08:00
Xavier Ducrohet
82a74bbe91
am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit '82fc005f579a20b3c7e63603f056ca095c288196':
2012-02-06 16:45:21 -08:00
Xavier Ducrohet
c9bcd33afa
am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit 'b1f95c6a938f6eaaa7a3fd28574a14647178059b':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
2012-02-06 16:44:32 -08:00
Xavier Ducrohet
b1f95c6a93
am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
2012-02-06 16:42:56 -08:00
Xavier Ducrohet
82fc005f57
am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
2012-02-06 16:42:41 -08:00
Xavier Ducrohet
331bb0c393
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).
This ensures that the icon is properly positionned and sized like
on devices.
(cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26)
Change-Id: Ifd3bc318089b70ba843519523e366e59d434e919
2012-02-06 16:40:03 -08:00
James Dong
c491cd2f90
am c10cd4a6: Merge "Don\'t call virtual function in destructor of SurfaceMediaSource"
...
* commit 'c10cd4a6e3021010786c1dbd69ab4e03ecb689e6':
Don't call virtual function in destructor of SurfaceMediaSource
2012-02-06 16:23:12 -08:00
James Dong
c10cd4a6e3
Merge "Don't call virtual function in destructor of SurfaceMediaSource"
2012-02-06 16:21:24 -08:00
Xavier Ducrohet
dc8a5a0dd1
am 327c8c2f: Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."
...
* commit '327c8c2fbcfa954b2216de5d627447bec2cd4ea8':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
2012-02-06 16:19:08 -08:00
Xavier Ducrohet
327c8c2fbc
Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."
2012-02-06 16:17:42 -08:00
Xavier Ducrohet
db3ee88b39
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
...
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).
This ensures that the icon is properly positionned and sized like
on devices.
(cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26)
Change-Id: Ie7fde04c6598bfa1b9c9f789233e1215ea3eb950
2012-02-06 16:15:03 -08:00
Xavier Ducrohet
fbc58f09a4
am 6c963980: Merge "Setup ActionBars in layoutlib the same way the platform does it."
...
* commit '6c9639803ee5829a41048e56f92774752b931b7f':
Setup ActionBars in layoutlib the same way the platform does it.
2012-02-06 15:54:49 -08:00
Xavier Ducrohet
6c9639803e
Merge "Setup ActionBars in layoutlib the same way the platform does it."
2012-02-06 15:52:58 -08:00
Amith Yamasani
e5fa4361b6
am 13c7b822: Merge "Check for null ActivityInfo."
...
* commit '13c7b82234c1c76aca74e23d635a69099611b18e':
Check for null ActivityInfo.
2012-02-06 15:41:45 -08:00
Amith Yamasani
13c7b82234
Merge "Check for null ActivityInfo."
2012-02-06 15:39:40 -08:00
Fabrice Di Meglio
a65bc502a4
Fix bug #5968466 system running out of memory during WebView performance test
...
- there can be only one Arabic "normal" fallback
Change-Id: I07f8123be0988bbb5b2fb23cc3fbf13870ef36c0
2012-02-06 15:33:30 -08:00
Amith Yamasani
2f6c9eb9c2
Check for null ActivityInfo.
...
Bug: 5970556
Change-Id: I87ebad1918311f24333d16cb6732742a1dd96685
2012-02-06 15:31:35 -08:00
Mangesh Ghiware
fda01cea33
am 5bd41b29: Merge "Use WebKit hit testing result for centering on double-tap zoom."
...
* commit '5bd41b2949fe25e19ba8ec62da7e204403c51061':
Use WebKit hit testing result for centering on double-tap zoom.
2012-02-06 15:28:15 -08:00