satok
855171bb57
Merge "Fix a test for system properties in frameworks/base/core"
2011-03-07 11:41:02 -08:00
Romain Guy
9d48708e28
am 15c6b719: am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
...
* commit '15c6b719fe8d1f4b27b4fa66ac94eede3957caf2':
Remove many unnecessary save/restore calls.
2011-03-07 11:28:13 -08:00
Romain Guy
3919d9577c
am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
...
* commit '0aaa11ed5be45170fb2535a6ce021c92b18d8878':
Remove many unnecessary save/restore calls.
2011-03-07 11:25:41 -08:00
Romain Guy
a7e4eecb9e
Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
2011-03-07 11:24:02 -08:00
Soojung Shin
8ba0aca94f
am 3fe49d81: am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit '3fe49d8168ab7344d495ea5ee8ed6b9ef3145495':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:16:07 -08:00
Soojung Shin
82009fc2a8
am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'fa680a18f617de202912b8a9fe3fc0890a9fe09e':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:10:28 -08:00
Andreas Huber
6757e62574
Merge "Added more metadata published by the MediaMetaDataRetriever"
2011-03-07 11:03:28 -08:00
Daniel Sandler
44cb1bcdfe
am a1a998af: am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* commit 'a1a998af3b47ecec4ee3f65eda723b7cb50e7699':
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:54:36 -08:00
Daniel Sandler
1c1a1a73e0
am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* commit 'ec1f1f4cfc6e253cee4320fe33a385d2218a9bb2':
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:50:54 -08:00
Daniel Sandler
9bcade1d19
Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* changes:
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:47:13 -08:00
Winson Chung
98d0d9865c
am c7dcd70a: am d452dbc2: Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
...
* commit 'c7dcd70a7801438f62e28883b28b3f457055785a':
Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)
2011-03-07 10:27:50 -08:00
Adam Powell
a779826d5b
am 1c94feb0: am 9ab91b84: Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
...
* commit '1c94feb04f20c0c3e193746a6f413557f4d12a30':
Fix bug 3509417 - Serialize touch event handling in webview
2011-03-07 10:25:16 -08:00
Winson Chung
eb40916cba
am d452dbc2: Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
...
* commit 'd452dbc2b62a9ddf7558965404f69f9a5e4ad1f5':
Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)
2011-03-07 10:24:42 -08:00
Adam Powell
6e83af3dc1
am 9ab91b84: Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
...
* commit '9ab91b843a82ccc853b78cc3c0f21c86e668418e':
Fix bug 3509417 - Serialize touch event handling in webview
2011-03-07 10:22:24 -08:00
Winson Chung
dddae61af5
Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
2011-03-07 10:21:11 -08:00
Adam Powell
411f3c817f
Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
2011-03-07 10:20:23 -08:00
Jesse Wilson
b9aa18e645
Merge "Remove deprecated and unused entryEvicted method."
2011-03-07 08:47:43 -08:00
Justin Ho
63337b2117
am ed16f582: am ef560044: Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
...
* commit 'ed16f58239f8a3f125d6ac340fae999fd1ecf633':
SearchView textfield backgrounds for bracketing the submit/voice button and improve padding.
2011-03-07 07:35:48 -08:00
Justin Ho
1783097b72
am ef560044: Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
...
* commit 'ef56004420cd9f1cb84f22e20d649ba8f1791dea':
SearchView textfield backgrounds for bracketing the submit/voice button and improve padding.
2011-03-07 07:32:04 -08:00
Justin Ho
1c1afcf63a
Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
2011-03-07 07:30:09 -08:00
Kristian Monsen
ce4a3e956f
am 6d7d68da: (-s ours) am 9f5f7af6: Deprecating webkit API\'s that might not be supported in the future do not merge
...
* commit '6d7d68da6c9508d0872912b4d5201efe571d8c19':
Deprecating webkit API's that might not be supported in the future do not merge
2011-03-07 05:19:11 -08:00
Kristian Monsen
a68a3411d6
am 9f5f7af6: Deprecating webkit API\'s that might not be supported in the future do not merge
...
* commit '9f5f7af6ccaf14303c109bfd5b2605eac16c46c6':
Deprecating webkit API's that might not be supported in the future do not merge
2011-03-07 05:10:12 -08:00
Xia Wang
fcb9b9777d
am 6b421e76: am 7d83f602: am 928ec5e0: Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb
...
* commit '6b421e76e9ee5c22cf2a785392b33a5024ee0051':
Modify connectivity manager test suite so that it can be run on Wi-Fi only device.
2011-03-05 09:31:58 -08:00
Scott Main
6a59a081ce
am 4342be2b: am d75ff0e2: am fa331d0d: docs: update publishing doc to remove pname search parameter
...
* commit '4342be2bb3a38d76c5fab2eb199ef1e7e99d567a':
docs: update publishing doc to remove pname search parameter
2011-03-05 09:31:54 -08:00
Xia Wang
67e0b2afe9
am 7d83f602: am 928ec5e0: Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb
...
* commit '7d83f6020c31c21b84114b35e6303895d082e18d':
Modify connectivity manager test suite so that it can be run on Wi-Fi only device.
2011-03-05 09:29:50 -08:00
Scott Main
2dcba736bd
am d75ff0e2: am fa331d0d: docs: update publishing doc to remove pname search parameter
...
* commit 'd75ff0e2965f28a5b3a93c6f4aeae306ebd2da79':
docs: update publishing doc to remove pname search parameter
2011-03-05 09:29:47 -08:00
Lorenzo Colitti
4a90184382
am eeab6905: am 362da509: (-s ours) am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread
...
* commit 'eeab69056d3648c04a1aca23381dba621c6c2658':
Add a protocol property to the APNs and use it.
2011-03-05 09:26:55 -08:00
Lorenzo Colitti
17cb99710f
am 23a63260: am ba76f2ac: (-s ours) am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
...
* commit '23a632609c1b6221cf06f36922e9ab95065aa938':
Make setupDataCall take a protocol parameter.
2011-03-05 09:26:43 -08:00
Xia Wang
05566e0b12
am 928ec5e0: Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb
...
* commit '928ec5e021162fe371da8bdac7f5bb2c854b1aa1':
Modify connectivity manager test suite so that it can be run on Wi-Fi only device.
2011-03-05 09:25:30 -08:00
Scott Main
406870feb4
am fa331d0d: docs: update publishing doc to remove pname search parameter
...
* commit 'fa331d0dfee0bc7324c788915292066e31842d49':
docs: update publishing doc to remove pname search parameter
2011-03-05 09:24:55 -08:00
Lorenzo Colitti
fc38d756b8
am 362da509: (-s ours) am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread
...
* commit '362da509897a497848860ea8b9944ab192ad1e4c':
Add a protocol property to the APNs and use it.
2011-03-05 09:19:42 -08:00
Lorenzo Colitti
3cf6b65abd
am ba76f2ac: (-s ours) am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
...
* commit 'ba76f2ac2a2edf9b3a2c67ab57f9514289473549':
Make setupDataCall take a protocol parameter.
2011-03-05 09:19:37 -08:00
Xia Wang
5de911bfea
Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb
2011-03-04 19:23:21 -08:00
Jeff Brown
3a9bdac172
Merge "Joystick tweaks."
2011-03-04 19:07:49 -08:00
Jeff Brown
8bb99ad892
Joystick tweaks.
...
Ensure that the joystick can always reach -1.0, 0.0 and 1.0 positions
even when noise filtering is applied. (Bug: 3514510)
Add support for a few more standard axes.
Add additional mapping modes for axes.
Some axes are inverted from standard interpretation
or are actually intended to be split into two distict axes
such as left/right trigger controls or accelerator/brake.
Add key layout file for a G25 racing wheel and XBox 360 controller
to tweak behavior. They work fine without them but the axis mappings
are not ideal.
Change-Id: Id4c86a0a272331c680039a9bde6815bb7eba44ab
2011-03-04 18:53:32 -08:00
Mike Cleron
135bc5b8a8
am 646528c6: am 54bb9869: Merge "Don\'t fail unlinking death recipients on dead binders" into honeycomb-mr1
...
* commit '646528c6cff69433d58d01728ada12fd2a50cf84':
Don't fail unlinking death recipients on dead binders
2011-03-04 18:02:41 -08:00
Mike Cleron
775630928a
am 54bb9869: Merge "Don\'t fail unlinking death recipients on dead binders" into honeycomb-mr1
...
* commit '54bb98698a3550250b332b2f4d756b1a5c7473f5':
Don't fail unlinking death recipients on dead binders
2011-03-04 18:00:29 -08:00
Mike Cleron
d3bd7b68fc
Merge "Don't fail unlinking death recipients on dead binders" into honeycomb-mr1
2011-03-04 17:58:09 -08:00
Benoit Goby
404cd294a5
Merge "Add support for USB Ethernet adapters"
2011-03-04 17:45:12 -08:00
Soojung Shin
771054210d
am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-04 17:16:49 -08:00
James Dong
b3153c11eb
am 0b7912d3: am 99b86247: Fix a leak from AACEncoder.cpp
...
* commit '0b7912d32848e123e3356d6452895f734b5dda7e':
Fix a leak from AACEncoder.cpp
2011-03-04 17:15:53 -08:00
Justin Ho
23b1a9d0a4
am b2b94050: am 0b51f574: Merge "Updated stat notification icons" into honeycomb-mr1
...
* commit 'b2b94050df924d3fb3cfe31f01ccd93c3d14ab66':
Updated stat notification icons
2011-03-04 17:15:13 -08:00
Justin Ho
d4494f19a5
am ac58f626: am abd481f6: Merge "Updated clock notification panel background (pressed state)" into honeycomb-mr1
...
* commit 'ac58f62665be4f3211f6efd2528c50812ac941ef':
Updated clock notification panel background (pressed state)
2011-03-04 17:15:10 -08:00
Leon Scroggins
b26d60dc44
am 85ac1e83: am 97827bbd: Merge "Update media controller appearance." into honeycomb-mr1
...
* commit '85ac1e836264e88e5c513fc8869d4fedc87d54e2':
Update media controller appearance.
2011-03-04 17:15:00 -08:00
James Dong
d1243bd20e
am 99b86247: Fix a leak from AACEncoder.cpp
...
* commit '99b862476df2f5d487db98a32a0c88e3a6be8420':
Fix a leak from AACEncoder.cpp
2011-03-04 16:50:27 -08:00
Robert Greenwalt
2c4df854dc
Merge "RIL: Merge Issue. LTE SIM additions."
2011-03-04 16:49:45 -08:00
Justin Ho
f5933cc519
am 0b51f574: Merge "Updated stat notification icons" into honeycomb-mr1
...
* commit '0b51f57479f243a597d7c73b6ac44d3e687bafa8':
Updated stat notification icons
2011-03-04 16:46:18 -08:00
Justin Ho
005dfc267a
am abd481f6: Merge "Updated clock notification panel background (pressed state)" into honeycomb-mr1
...
* commit 'abd481f686ccce3eb1277ba6d560960d640dc4bb':
Updated clock notification panel background (pressed state)
2011-03-04 16:46:13 -08:00
Leon Scroggins
74769bd37c
am 97827bbd: Merge "Update media controller appearance." into honeycomb-mr1
...
* commit '97827bbd6ce10471f2c4399ffbe4dce2faf6d632':
Update media controller appearance.
2011-03-04 16:46:04 -08:00
Justin Ho
11d2737b69
Merge "Updated stat notification icons" into honeycomb-mr1
2011-03-04 15:40:00 -08:00