Commit Graph

24465 Commits

Author SHA1 Message Date
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
Robert Greenwalt
7b97c239ce Merge "Make getDataEnabled take more into account." 2010-11-12 08:50:50 -08:00
Gil Dobjanschi
d01cc474a2 Merge "Invalidate transitions when an image media item duration changes." 2010-11-11 19:09:25 -08:00
Jeff Brown
4ebaba73ad Merge "Add new keycodes initially used for GoogleTV devices." 2010-11-11 18:47:57 -08:00
Adam Powell
48e5897b33 Merge "Bug 3183184 - add fade-out for selectable item backgrounds" 2010-11-11 18:41:33 -08:00
Jason Bayer
af34db4dcb Add new keycodes initially used for GoogleTV devices.
Change-Id: I1b901037d6d401931dd3ec6f7d5e1e6ad165d1c9
2010-11-11 18:36:11 -08:00
Xavier Ducrohet
60d1ea99f7 Merge "Misc fix in layoutlib bridge + View.isIneditMode as delegate." 2010-11-11 17:43:28 -08:00
Eric Laurent
f0a08011a8 Merge "Temporary workaround for issue 3187563" 2010-11-11 17:24:27 -08:00
Andreas Huber
3227e05d24 Merge "Increase the prefetcher's low water mark so it restarts fetching data earlier." 2010-11-11 17:15:52 -08:00
Scott Main
b3e7e635a2 am 16555c60: am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
* commit '16555c60f7231b014375cbc62fd83b1c53879984':
  docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
2010-11-11 17:12:32 -08:00
Wink Saville
250898e271 Merge "GsmServiceStateTracker#getPhone should be protected not public." 2010-11-11 17:04:38 -08:00
Scott Main
e7d586668c am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
* commit 'd6b9d078ecf1b4d7cc57375830cf2ce390fc893c':
  docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
2010-11-11 17:02:54 -08:00
Scott Main
20fd8e71ab Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread 2010-11-11 16:56:19 -08:00
Elliott Hughes
b29272a4d4 Merge "Use deliberately public API rather than org.apache cruft." 2010-11-11 16:54:07 -08:00
Vasu Nori
ffe02b28b8 Merge "add column to downloads table to store error msg when a download fails" 2010-11-11 16:35:43 -08:00
Adam Powell
561f948488 Merge "First pass at styling progress bars for Holo." 2010-11-11 16:04:09 -08:00