Mike Lockwood
3923293d37
Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList"
2010-11-15 11:27:47 -08:00
Kenny Root
7986fe5035
Merge "Split UTF functions from String8/16"
2010-11-15 11:11:22 -08:00
Adam Cohen
d0834f730a
Merge "Fix for Issue: 3196583"
2010-11-15 11:09:59 -08:00
Wink Saville
edae3f3887
Merge "Add html formatting to AsyncChannel & Hsm class comments."
2010-11-15 11:00:49 -08:00
Brad Fitzpatrick
5e08bc3db3
Merge "Disable CloseGuard early. (it defaults to spammy otherwise)"
2010-11-15 10:47:49 -08:00
Brad Fitzpatrick
5e8887db6a
Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()"
2010-11-15 10:47:32 -08:00
Andreas Huber
87558766fb
Merge "More HTTP live support, AES encryption etc."
2010-11-15 10:07:38 -08:00
Andreas Huber
47ad585fe3
Merge "Refactor h.264 profile/level support into avc_utils."
2010-11-15 10:07:31 -08:00
Andreas Huber
52868f758c
Merge "Provide bandwidth estimation support in NuHTTPDataSource"
2010-11-15 10:07:24 -08:00
Andreas Huber
cfa1bf4097
Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."
2010-11-15 10:07:17 -08:00
Adam Cohen
981e2def17
Merge "Adding click feedback to StackView"
2010-11-15 10:05:58 -08:00
James Dong
046ba44980
Merge "Remove legacy PV stuff"
2010-11-15 09:57:33 -08:00
Mike Lockwood
1b1c617819
Merge "MTP: Partial implementation of the GetObjectPropList command"
2010-11-15 09:51:10 -08:00
Justin Ho
a54ca1b4a0
am b9d3e359: (-s ours) am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
...
* commit 'b9d3e35907e6b7e2c766f4813ab2e0463c920c37':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:16:13 -08:00
Justin Ho
623d4d5251
am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
...
* commit '868889fb4175979ef9aa505fc746bf616f54ed10':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:13:16 -08:00
Justin Ho
d7c7bb65e7
Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
2010-11-15 09:10:33 -08:00
Justin Ho
22338c4ddc
am dc04f537: (-s ours) am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
...
* commit 'dc04f53703f68f0a4fb13858cbf71b760cf48368':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:57:11 -08:00
Justin Ho
71dd0387c2
am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
...
* commit 'a5c4aeba1cb53775bdb5622569ffe53641f4728d':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:53:56 -08:00
Justin Ho
793bd745e3
Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
2010-11-15 08:50:19 -08:00
Mike Lockwood
ccf2280766
Merge "MediaScanner: Add support for importing file based playlists copied over MTP"
2010-11-15 08:39:00 -08:00
James Dong
efee5581b7
Merge "Disable flaky streaming server check"
2010-11-15 08:13:30 -08:00
James Dong
9cb03e055e
Merge "Fix a typo in LOG_TAG for MediaPlayer unit tests"
2010-11-15 08:11:32 -08:00
Ben Murdoch
3f34e9a459
Merge "Stop loading if the user cancels the SSL certificate warning dialog"
2010-11-15 02:33:50 -08:00
Adam Powell
ae8502761e
Merge "Revised assets for progress bars and indeterminate progress spinners."
2010-11-12 19:19:19 -08:00
Megha Joshi
b06b0c421b
am 7bcccece: (-s ours) am e2ef2c10: Fixing build (DO NOT MERGE)
...
* commit '7bcccece88734fb714c417d9d263065212f59d24':
Fixing build (DO NOT MERGE)
2010-11-12 19:16:06 -08:00
Megha Joshi
561c3ae486
am e2ef2c10: Fixing build (DO NOT MERGE)
...
* commit 'e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
Fixing build (DO NOT MERGE)
2010-11-12 19:13:35 -08:00
Megha Joshi
36f67fae21
am 7e059716: (-s ours) am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
...
* commit '7e059716923cd02a4c42751c67892e090bfd5f33':
Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:48:56 -08:00
Megha Joshi
602ae138da
am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
...
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:46:38 -08:00
Dianne Hackborn
992b362bf6
Merge "Change recents UIs to do task switches."
2010-11-12 18:18:15 -08:00
Brian Muramatsu
1e96b2e3cb
Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict"
2010-11-12 15:55:14 -08:00
Kenny Root
c412dcb3eb
Split UTF functions from String8/16
...
Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.
Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7
2010-11-12 15:53:40 -08:00
Vasu Nori
e6cbd32ed1
Merge "remove unnecessary code from DownloadManager"
2010-11-12 15:46:25 -08:00
Gil Dobjanschi
e981a8cafd
Merge "Transition invalidation bug fix."
2010-11-12 15:39:16 -08:00
James Dong
509355bae2
Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
2010-11-12 15:33:41 -08:00
satok
c03ad9f911
Merge "Add a function to switch back to the last used IME"
2010-11-12 15:03:03 -08:00
Jason Sams
9b2f41d4a4
Merge "Fix line drawing in RS example."
2010-11-12 15:02:06 -08:00
Jason Sams
534319b939
Merge "Document RS element and type and add validity checking to type creation."
2010-11-12 15:01:07 -08:00
Xavier Ducrohet
1dfa703369
Merge "Layoutlib: Fix alpha support in Canvas/Paint."
2010-11-12 14:58:55 -08:00
Xavier Ducrohet
a0b3aac4e2
Merge "Layoutlib: Fill the default prop value map for View objects."
2010-11-12 14:58:48 -08:00
Jeff Brown
e33a9ecc25
Enable touch splitting for all windows by default.
...
New default only applies to applications with targetSdkVersion >=
HONEYCOMB. Old applications default to no touch splitting for
their windows.
In addition, enabled split touch for various system windows.
Bug: 3049580
Change-Id: Idc8da9baa2cd8e1e4e76af8967d7b6a5ccb94427
2010-11-12 14:53:43 -08:00
Brad Fitzpatrick
ead98b9cae
Merge "Disable SamplingProfilerIntegration until it's fixed."
2010-11-12 13:24:09 -08:00
Shimeng (Simon) Wang
88f14c5fef
Merge "Fix mobile sites' viewport in fixed viewport mode."
2010-11-12 13:16:24 -08:00
Gilles Debunne
6bf814ea6b
Merge "Added a flag for TextView that allows for text selection in read-only TextViews."
2010-11-12 12:23:00 -08:00
Adam Cohen
c4007bb84c
Merge "-Prevent StackView from advancing while interacting with it -Fixed null pointer exception Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297"
2010-11-12 11:38:35 -08:00
Leon Scroggins
e1382ea208
Merge "Provide variable for debugging the text in WebTextView."
2010-11-12 11:20:13 -08:00
Jason Sams
ecddfccccd
Merge "More documentation."
2010-11-12 11:15:59 -08:00
Tor Norbye
1a1b462204
Merge "Fix fill color alpha in layoutlib"
2010-11-12 10:43:46 -08:00
Adam Powell
dc7d87e8e4
Merge "Fix bug 3146938 - Menus spawned by ActionBar should hide when action bar is hidden"
2010-11-12 10:37:50 -08:00
Alon Albert
5b43b1c8eb
Merge "Improve logging"
2010-11-12 09:57:49 -08:00
Jaikumar Ganesh
ac86318807
Merge "Don't call cancel discovery when its already canceelled."
2010-11-12 09:45:11 -08:00