The Android Open Source Project
067af269ed
am 01383571: am 07bebe8b: Reconcile with ics-mr1-release
...
* commit '0138357198244b5bda242e248ed98040622ea5af':
Don't use SNR in the invalid check.
2012-02-07 10:12:59 -08:00
The Android Open Source Project
0138357198
am 07bebe8b: Reconcile with ics-mr1-release
...
* commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
Don't use SNR in the invalid check.
2012-02-07 10:11:11 -08:00
The Android Open Source Project
07bebe8b12
Reconcile with ics-mr1-release
...
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
2012-02-07 10:09:08 -08:00
Marco Nelissen
f047c14f23
Merge "Make media scanner use new delete-parameter"
2012-02-07 08:28:02 -08:00
Marco Nelissen
ac259f17a0
Make media scanner use new delete-parameter
...
This speeds up the media scan case where many files were deleted or moved.
Change-Id: I86e6fc6d0968eebf24923c0b5587b90d309721bb
2012-02-07 07:54:39 -08:00
Chih-Chung Chang
fb2cfa223b
Comment out a warning message to avoid log spamming.
...
The warning message happens a lot when the region decoder is used (like
viewing a picture in the Gallery app).
Change-Id: I435f92eac8f322b091f3ed14ee48d0b5f0d84a8a
2012-02-07 13:07:51 +08:00
John Wang
2ca5fb2f46
Don't use SNR in the invalid check.
...
Since some RILs use -1 instead of INVALID_SNR as invalid vlue for
LTE SNR, SignalStrength will not use LTE SNR to check if LTE valid.
bug:5970403
Change-Id: Ia948e076f8f5878e081e87680076b187857879c8
2012-02-06 20:29:06 -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
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
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
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
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
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
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
c10cd4a6e3
Merge "Don't call virtual function in destructor of SurfaceMediaSource"
2012-02-06 16:21:24 -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
6c9639803e
Merge "Setup ActionBars in layoutlib the same way the platform does it."
2012-02-06 15:52:58 -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
5bd41b2949
Merge "Use WebKit hit testing result for centering on double-tap zoom."
2012-02-06 15:27:08 -08:00
Xavier Ducrohet
7396348dfc
Setup ActionBars in layoutlib the same way the platform does it.
...
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.
Change-Id: I57432afa82d257bb043247001320b368045d7f55
2012-02-06 15:11:12 -08:00
Mangesh Ghiware
5fe6f951ac
Use WebKit hit testing result for centering on double-tap zoom.
...
Iterate over the bounding boxes and find one large enough to fit the
screen width at reading scale. Align to left edge of said box.
Bug: 5175030
Bug: 5768421
Change-Id: Iac01e145336918b0a2b21d2864f46ba532aaf18f
2012-02-06 15:01:57 -08:00
Scott Main
cb6831d7b6
am f9bb376b: am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'f9bb376bd7bfb6bdc77e1621a340122c29afd21c':
2012-02-06 14:45:41 -08:00
Scott Main
053e0d14bb
am dbee29ba: am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'dbee29ba559a0c16919b5977ed4972481b0a98ec':
docs: switch from caps to initial-case for device button names
2012-02-06 14:45:39 -08:00
Jean-Baptiste Queru
0a3f6d69b6
am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
...
* commit '33476f7ad1c3b4dcaefddb306f315e201c4efb33':
Skia API changes as a result of an update to the Skia library.
2012-02-06 14:45:36 -08:00
Scott Main
f9bb376bd7
am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'afaec57668551b797505f43d9d9677979dedf0c9':
2012-02-06 14:15:06 -08:00
Scott Main
dbee29ba55
am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit '5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
docs: switch from caps to initial-case for device button names
2012-02-06 14:14:09 -08:00
Scott Main
afaec57668
am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
2012-02-06 14:12:39 -08:00
Jean-Baptiste Queru
33476f7ad1
am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
...
* commit 'f79bcd2dd5d82376640661f50aa2e9237af7c02c':
Skia API changes as a result of an update to the Skia library.
2012-02-06 14:12:05 -08:00
Scott Main
5a0fe6fc13
am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
...
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
2012-02-06 14:12:03 -08:00