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
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
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
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
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
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
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
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
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
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
James Dong
b53b7358c3
Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1
2011-03-04 11:37:07 -08:00
Gilles Debunne
f3443a518e
Merge "getTextRunCursor gets deprecated in SpannableStringBuilder" into honeycomb-mr1
2011-03-04 11:36:17 -08:00
Scott Main
b41feb7850
am 42424da2: am 22724f38: docs: fix toc link in publishing doc
...
* commit '42424da28b7e2c61d48b13f0daaf2f5b94788c93':
docs: fix toc link in publishing doc
2011-03-04 11:23:07 -08:00
Scott Main
987701600d
am 4f996852: am a2f21847: docs: update market publishing doc
...
* commit '4f996852e14eea9a7f88715c56484225f52b5d45':
docs: update market publishing doc
2011-03-04 11:23:00 -08:00
Scott Main
856c57e6d2
am 22724f38: docs: fix toc link in publishing doc
...
* commit '22724f3873b50747ca0fb41bbc5fe9b1acacadf2':
docs: fix toc link in publishing doc
2011-03-04 11:17:53 -08:00
Scott Main
b1d645bfe1
am a2f21847: docs: update market publishing doc
...
* commit 'a2f21847d97042677efdd3b4f001bdbdc8dd1a43':
docs: update market publishing doc
2011-03-04 11:17:28 -08:00
Chet Haase
5e73f7ca71
am b0be85f5: Merge "Fix problem with transparent background on Twitter app" into honeycomb-mr1
...
* commit 'b0be85f50d55b03a34bec5bbb326daa79d5907fe':
Fix problem with transparent background on Twitter app
2011-03-04 10:39:15 -08:00
Chet Haase
37737260cf
Merge "Fix problem with transparent background on Twitter app" into honeycomb-mr1
2011-03-04 10:35:40 -08:00
Scott Main
568ba3674f
am b1912259: am c44f3907: docs: add redirects for preview docs
...
* commit 'b191225940ba2f1f56100e62ba2a4f6a49e820ea':
docs: add redirects for preview docs
2011-03-04 09:45:56 -08:00
Scott Main
ad14461752
am c44f3907: docs: add redirects for preview docs
...
* commit 'c44f3907c4a45a1b3724535bf4aa6de7f31224ee':
docs: add redirects for preview docs
2011-03-04 09:42:52 -08:00
Leon Scroggins
e669e07e64
am 91ac3dc0: Merge "Use the same width as the TextView created layout." into honeycomb-mr1
...
* commit '91ac3dc06d1b99c5e63cda3b5ae0adfec406fd7a':
Use the same width as the TextView created layout.
2011-03-04 09:35:25 -08:00
Leon Scroggins
e0c415762a
Merge "Use the same width as the TextView created layout." into honeycomb-mr1
2011-03-04 09:32:14 -08:00
Ken Wakasa
0a7760f765
am 6e38d26c: Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1
...
* commit '6e38d26c1e66cc957c33d4263013e02623ebd6da':
Fix the sort order of the input methods & subtypes in the settings.
2011-03-04 02:59:48 -08:00
Ken Wakasa
82da7c2e21
Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1
2011-03-04 02:57:20 -08:00
Dianne Hackborn
661f883880
am f8b8a3fa: Refector preferred activity code out of package manager.
...
* commit 'f8b8a3fa955b545843ca264428c620b67c2a5359':
Refector preferred activity code out of package manager.
2011-03-04 00:22:40 -08:00
Dianne Hackborn
17bd93939a
am 48f91e35: Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1
...
* commit '48f91e35c5188f3dc78c12b8e8638a248221691b':
Fix Fragment.onInflate() to actually work correctly.
2011-03-04 00:16:57 -08:00
Svetoslav Ganov
3c154c56df
am 1e158e9c: Merge "Propagating core settings to the system process." into honeycomb-mr1
...
* commit '1e158e9ce78c25dc5de402f14654a8955de7fddc':
Propagating core settings to the system process.
2011-03-04 00:16:53 -08:00
Rebecca Schultz Zavin
0da6dab937
am 327e94da: Merge "set max_events_per_sec to 55" into honeycomb-mr1
...
* commit '327e94daff12ab4ac4da61a3ea802f3f225d1b3a':
set max_events_per_sec to 55
2011-03-04 00:16:49 -08:00
Rebecca Schultz Zavin
a1e348793d
am 72b3524e: Merge "Set last event time to previous event batch delivery time to apps" into honeycomb-mr1
...
* commit '72b3524eef79abc6680aae713b270cbf3d88be6c':
Set last event time to previous event batch delivery time to apps
2011-03-04 00:16:45 -08:00
satok
781e9d4afc
am 73016396: Merge "Add a test for persist properties settings" into honeycomb-mr1
...
* commit '73016396993efaa7b4bc23b5e8bf198deb230a2a':
Add a test for persist properties settings
2011-03-04 00:16:32 -08:00
Christopher Tate
e26442d949
am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1
...
* commit '87ed42d065653aa30b2d1b8b220b75375cf9af30':
Don't spuriously time out restore sessions
2011-03-04 00:16:27 -08:00
Michael Kolb
ffd51f5638
am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1
...
* commit 'd7e80b9d5046603ac4a36ea74e204a2ad70a4dca':
fix NPE in getSearchBox
2011-03-04 00:16:22 -08:00
Ken Wakasa
ae19cefe3e
am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select input method" dialog" into honeycomb-mr1
...
* commit 'a7001ee8b60d66c25de69c8496108c40a0f2df88':
Append IME's name to the subtype name in the "Select input method" dialog
2011-03-04 00:16:16 -08:00
Stephen Hines
96b197ace2
am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
...
* commit '6e71c954faff34b78a2952436b4f48d84a8c20cd':
DO NOT MERGE: Almost all warnings are now errors in RS build.
2011-03-04 00:16:11 -08:00
Wink Saville
41b12cc6e5
am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1
...
* commit '389bf4f734f1820e31f8807d117b6b15ded9ff8b':
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-04 00:16:05 -08:00