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
e89d1041dd
Joystick tweaks. (DO NOT MERGE)
...
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: I0fddd90309af4dc14d35f34fe99ed6e521c0b7c7
2011-03-04 19:12:41 -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
David Li
b33d5cff62
Added screenshot after glDraw* option to GLES2 Debugger
...
Also added timing mode option using utils/Timers.h.
Factored out common code to reduce size.
Improved Protobuf message.
Uploads data from glBufferData and glBufferSubData.
Change-Id: Iaae5e706235d942df81c7eada7223fb0b0583911
Signed-off-by: David Li <davidxli@google.com>
2011-03-04 17:50:48 -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
Justin Ho
71a704125f
Merge "Updated clock notification panel background (pressed state)" into honeycomb-mr1
2011-03-04 15:22:01 -08:00
Leon Scroggins
ffa60977a7
Merge "Update media controller appearance." into honeycomb-mr1
2011-03-04 15:03:46 -08:00
Eric Fischer
1deaf0201a
am 2f314844: (-s ours) am 4d3e7fb7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '2f3148445ff7d6df74b7a1b07858c379157e12df':
Import revised translations. DO NOT MERGE
2011-03-04 13:56:52 -08:00
Eric Fischer
0274b3a554
am 4d3e7fb7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '4d3e7fb7ab00c190aa7ce4f8a4d5174909067ccc':
Import revised translations. DO NOT MERGE
2011-03-04 13:54:25 -08:00
Eric Fischer
61f69c92f0
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-04 13:52:11 -08:00
Jean-Michel Trivi
6d42d8efdc
am d1a75f70: am 371fd13c: Merge "Fix bug 3511256 invalid TTS parameter cache size" into honeycomb-mr1
...
* commit 'd1a75f70d00948c24a130847280bdbaa79c6c2fd':
Fix bug 3511256 invalid TTS parameter cache size
2011-03-04 12:11:25 -08:00
Jean-Michel Trivi
f214858df2
am 371fd13c: Merge "Fix bug 3511256 invalid TTS parameter cache size" into honeycomb-mr1
...
* commit '371fd13c31b7e067fafc680948b907b6a0a621d7':
Fix bug 3511256 invalid TTS parameter cache size
2011-03-04 12:08:40 -08:00
Jean-Michel Trivi
03c403f8fd
Merge "Fix bug 3511256 invalid TTS parameter cache size" into honeycomb-mr1
2011-03-04 12:06:22 -08:00
James Dong
ae71a9961f
am 70d7522e: am 865448a0: Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1
...
* commit '70d7522e9f25f80f528d9737fa67976eacb24afd':
Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
2011-03-04 11:42:41 -08:00
Gilles Debunne
1de139b368
am 25dddbfc: am 78e76847: Merge "getTextRunCursor gets deprecated in SpannableStringBuilder" into honeycomb-mr1
...
* commit '25dddbfc6e2d84e941cb898cf2a4c9772f975075':
getTextRunCursor gets deprecated in SpannableStringBuilder
2011-03-04 11:42:36 -08:00
Scott Main
bfd1a74271
am ea58d30d: am 42424da2: am 22724f38: docs: fix toc link in publishing doc
...
* commit 'ea58d30df9bfc015ce82459bb1f46e054a46a090':
docs: fix toc link in publishing doc
2011-03-04 11:42:25 -08:00
Scott Main
c8ada6fec0
am 46a51bec: am 4f996852: am a2f21847: docs: update market publishing doc
...
* commit '46a51bec2b81fbba63f43b3293ec27b464ced322':
docs: update market publishing doc
2011-03-04 11:42:21 -08:00
James Dong
6b2cec0158
am 865448a0: Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1
...
* commit '865448a04f4921877d652c3018ef65bada312084':
Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
2011-03-04 11:39:15 -08:00
Gilles Debunne
52e7492c35
am 78e76847: Merge "getTextRunCursor gets deprecated in SpannableStringBuilder" into honeycomb-mr1
...
* commit '78e7684713ddac5e8e3cf69b702cbcb4e473aacd':
getTextRunCursor gets deprecated in SpannableStringBuilder
2011-03-04 11:39:09 -08:00
Chet Haase
5341ff2c35
am d44cbcc1: am b0be85f5: Merge "Fix problem with transparent background on Twitter app" into honeycomb-mr1
...
* commit 'd44cbcc194cdd14ce448139ea5f555a8dd3ed342':
Fix problem with transparent background on Twitter app
2011-03-04 11:38:10 -08:00
Scott Main
fbddc46c6f
am eb3e7f34: am b1912259: am c44f3907: docs: add redirects for preview docs
...
* commit 'eb3e7f341d8a2e0edfbc5d282bb27862a30f07c3':
docs: add redirects for preview docs
2011-03-04 11:37:37 -08:00