Commit Graph

24426 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
fdfafd7dd3 am 218e0033: am 11dba787: Merge "Fix build (broken documentation link)"
* commit '218e00336a9dc348f8487442e58f7e6d1376b9e1':
  Fix build (broken documentation link)
2010-11-17 17:58:21 -08:00
Jean-Baptiste Queru
c6655ffd8a am 11dba787: Merge "Fix build (broken documentation link)"
* commit '11dba787e10ff5ddc27e834db42acefa33cd35be':
  Fix build (broken documentation link)
2010-11-17 17:56:00 -08:00
Jean-Michel Trivi
e020391813 Merge "Fix bug 3183484 unhide MediaRecorder.AudioSource.VOICE_COMMUNICATION" 2010-11-17 17:49:49 -08:00
Jean-Baptiste Queru
5f17185a76 Merge "Fix build (broken documentation link)" 2010-11-17 17:41:22 -08:00
Jean-Baptiste Queru
3f02b88af6 am 5e069074: am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI"
* commit '5e0690745a45f99d12d940dd4aaae814b00a429e':
  Framebuffer: Support variable number of framebuffers in the UI
2010-11-17 17:36:11 -08:00
Jean-Baptiste Queru
fea48b2151 Merge "resolved conflicts for merge of 1a2344b8 to master" 2010-11-17 17:35:09 -08:00
Jean-Baptiste Queru
bda00faca8 resolved conflicts for merge of 1a2344b8 to master
Change-Id: I974f7f388ddc74d661f07fda1e308e7c15e00dfc
2010-11-17 17:31:25 -08:00
Jean-Baptiste Queru
af10976583 am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in the UI"
* commit 'a15e4886de8f75f3cb137f51743d330414c910e8':
  Framebuffer: Support variable number of framebuffers in the UI
2010-11-17 17:29:48 -08:00
Wink Saville
28462eb7a6 Merge "Fix GSM permanent failure handling." 2010-11-17 17:17:28 -08:00
Jean-Baptiste Queru
d5b427b709 am 09e50cdb: Merge "Reorder lock acquision vs try."
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
  Reorder lock acquision vs try.
2010-11-17 17:16:06 -08:00
Jean-Baptiste Queru
90ea001a09 Merge "Framebuffer: Support variable number of framebuffers in the UI" 2010-11-17 17:15:42 -08:00
Daniel Sandler
37b4141324 Merge "Implement new lights-out mode in system bar." 2010-11-17 17:11:30 -08:00
Jean-Baptiste Queru
a7011da1f7 Merge "Reorder lock acquision vs try." 2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
b2aed43b57 am 7ee42771: Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp
* commit '7ee427714d4621bd9a0b15364a073aff60ebf20c':
  Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
2010-11-17 16:54:39 -08:00
Jean-Baptiste Queru
a7dda98df7 Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-11-17 16:52:56 -08:00
Jean-Baptiste Queru
8ff8a2d029 resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
2010-11-17 16:47:59 -08:00
Dirk Dougherty
02ef5c8fdd am 31c5f68d: am fc1f5e24: doc change: update uses-feature for gingerbread.
* commit '31c5f68d8f4af170415c206753f08fa85aa6b2ff':
  doc change: update uses-feature for gingerbread.
2010-11-17 16:24:04 -08:00
Dirk Dougherty
a25a6835e7 am fc1f5e24: doc change: update uses-feature for gingerbread.
* commit 'fc1f5e24bcd678a08221c8c01a364807edca6daf':
  doc change: update uses-feature for gingerbread.
2010-11-17 16:20:59 -08:00
Adam Powell
ee022d2182 Merge "Fix bug 3207067 - adjust AbsListView content pop-in when clipToPadding=false" 2010-11-17 16:05:53 -08:00
Jason Sams
e210e89ffa Merge "Create holder inner class for pushing context state. Fix bug with rsForEach corrupting parent context state. Remove workaround from rsBalls." 2010-11-17 15:31:59 -08:00
Jean-Baptiste Queru
3bffa0529c Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter." 2010-11-17 15:10:05 -08:00
Mike Lockwood
303beda620 Merge "MTP: Fixes to allow file transfers > 4 gigabytes" 2010-11-17 15:00:10 -08:00
Jean-Michel Trivi
fde69aa24a Merge "SIP calls should set the audio mode to MODE_IN_COMMUNICATION" 2010-11-17 14:55:10 -08:00
Brian Muramatsu
ccda6ac47e Merge "Fix NPE in InstrumentationTestRunner" 2010-11-17 14:17:24 -08:00
Adam Powell
86ccacc21a Merge "Add resource ID variants of ActionBar tab setters" 2010-11-17 14:12:19 -08:00
Teng-Hui Zhu
62147acc87 Merge "Update Useragent String" 2010-11-17 13:46:25 -08:00
Jim Miller
7b8ceb48e5 Merge "Fix 3191824: Fix lockscreen portrait mode for xlarge devices" 2010-11-17 13:28:22 -08:00
Mike Lockwood
e64b137ae8 Merge "MTP: Set correct format for abstract audio playlists" 2010-11-17 12:50:28 -08:00
Eric Fischer
be66e583c9 Merge "Import revised translations." 2010-11-17 12:09:30 -08:00
Brad Fitzpatrick
3ab29997b7 Merge "More cleanups from CloseGuard reports." 2010-11-17 12:01:20 -08:00
Kenny Root
44e13f3426 Merge "Don't waste resources creating new Boolean objects" 2010-11-17 11:50:15 -08:00
Kristian Monsen
cb79916f6f Merge "Removing some js script tests from the skip list" 2010-11-17 11:48:18 -08:00
Tom Taylor
7422601b50 Merge "Add a public Theme.Holo.Wallpaper.NoTitleBar" 2010-11-17 11:35:21 -08:00
Cary Clark
61f7b617c2 Merge "don't put up a context menu while selecting text" 2010-11-17 11:00:53 -08:00
Jean-Michel Trivi
24818bfe68 Merge "Add new audio mode for audio communications other than telelphony." 2010-11-17 09:49:23 -08:00
Joe Onorato
d594fb6f9e Merge "Updated layouts for new status bar" 2010-11-16 21:41:33 -08:00
Dianne Hackborn
c1b3b648e0 Merge "Fix issue #3202866: system server crash" 2010-11-16 19:36:31 -08:00
Chris Tate
6af90fa8d9 Merge "Permission fix: don't require BACKUP perm for self-restores" 2010-11-16 18:44:06 -08:00
Jason Sams
f4e8380497 Merge "Fix ref counting for globals when set from java code." 2010-11-16 18:30:58 -08:00
Dianne Hackborn
ffd83233a2 am d28dc3cf: (-s ours) am 05434e9f: Final API 9. Really! Honestly! I hope.
* commit 'd28dc3cf7738f5574ef6359a67d68820dc6c2ad4':
  Final API 9.  Really!  Honestly!  I hope.
2010-11-16 18:10:48 -08:00
Jeff Sharkey
1bd4b01bdd Merge "Show Bitmap.Config value when unable to handle." 2010-11-16 18:10:02 -08:00
Vasu Nori
cdee573783 Merge "return file uri from downloadmanager instead of content uri for public downloads" 2010-11-16 18:06:10 -08:00
Dianne Hackborn
ae1f9dce70 am 05434e9f: Final API 9. Really! Honestly! I hope.
* commit '05434e9fa7a6ec844611bbd154c4a3eceafec538':
  Final API 9.  Really!  Honestly!  I hope.
2010-11-16 17:49:07 -08:00
Gilles Debunne
8a9ef88781 Merge "Fix for IOOBoundsExc in SpannableStringBuilder" 2010-11-16 17:43:19 -08:00
Fred Quintana
59da4a80e3 Merge "handle a race condition where a cursor receives an inflight onChange after the cursor has been closed" 2010-11-16 17:36:43 -08:00
Brad Fitzpatrick
837b59aad5 Merge "Annotate ListView with StrictMode.Span" 2010-11-16 17:27:43 -08:00
Patrick Dubroy
137ec7de55 Merge "Reduce amount of garbage created when flipping StackViews" 2010-11-16 17:02:29 -08:00
Costin Manolache
94791ce38d Merge "Remove notifications for account when account is removed." 2010-11-16 16:54:45 -08:00
Amith Yamasani
b902e4b571 Merge "3049240 TalkBack on Accessibility Options reads out passwords entered in during Lock screen" 2010-11-16 16:47:40 -08:00
Wink Saville
ebe22f1492 Merge "Cleanup some debug output." 2010-11-16 16:15:36 -08:00