Commit Graph

35953 Commits

Author SHA1 Message Date
Romain Guy
6618b64ea0 Merge changes I00b54796,Iac465b72
* changes:
  Change max heap size to 48MB
  Fix memory leak in OpenGLRenderer.
2011-06-22 16:14:58 -07:00
Romain Guy
24f1548d8a Merge "Collapse UI events in TextureView." 2011-06-22 15:01:59 -07:00
Brian Carlstrom
9fcb640455 Merge "Fix build." 2011-06-22 14:45:10 -07:00
Robert Greenwalt
54b5eae0ac Merge "resolved conflicts for merge of 7a652bc8 to master" 2011-06-22 14:41:09 -07:00
Dianne Hackborn
5297b1d11a Merge "Don't report a resize unless the window's surface actually changed." 2011-06-22 14:13:35 -07:00
Shailendra
ef71e3cb48 Merge "Fix for kenBurn Effect for PNG image is crashing (4861071 )" 2011-06-22 14:13:21 -07:00
Gloria Wang
8f207a9e12 Merge "Timed text display format support: 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata" 2011-06-22 13:47:45 -07:00
Romain Guy
3b965bfe26 Merge "Fix the issue where TextureView stuck if the producer side is too fast." 2011-06-22 13:42:34 -07:00
Brian Carlstrom
383fca63b7 Merge "JniUtil depends on webcore native library and should not depend on others to load it" 2011-06-22 13:42:07 -07:00
Robert Greenwalt
c0f7f2585f resolved conflicts for merge of 7a652bc8 to master
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
2011-06-22 13:20:14 -07:00
Adam Powell
0589681b57 Merge "Fix bug 4807086 - Options menu panel too narrow in landscape" 2011-06-22 12:58:03 -07:00
Mike Lockwood
b4a4a3de4c Merge changes I9851299e,I4160e73a
* changes:
  Combine UsbManager.setPrimaryFunction and setDefaultFunction
  Fix window leak in UsbPreferenceActivity
2011-06-22 12:24:26 -07:00
Svetoslav Ganov
f066e54fea Merge "Minor tweak I forgot in the presious change." 2011-06-22 11:41:25 -07:00
Svetoslav Ganov
f6a12fe969 Merge "AccessibilityNodeInfo bounds inconsistent with compatibility mode." 2011-06-22 11:35:47 -07:00
James Dong
315efc241c Merge "Add some error log messages to indicate the failure of a recording session" 2011-06-22 11:07:52 -07:00
James Dong
5299258ce2 Merge "Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem" 2011-06-22 10:33:25 -07:00
Philip Milne
cb596e02c3 Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock." 2011-06-22 10:18:32 -07:00
satok
574ce433aa Merge "Create TextServiceManager and SpellCheckerService" 2011-06-22 00:02:55 -07:00
satok
81010fb4a5 Merge "Add an ongoing notification to switch IME" 2011-06-21 23:09:00 -07:00
Jeff Brown
88f2b8f0f7 Merge "Only handle onHoverEvent in actionable views." 2011-06-21 21:12:24 -07:00
Jeff Brown
fb39d95b59 Merge "Fix taint and nesting bugs." 2011-06-21 21:12:19 -07:00
Adam Powell
9f6e84167b Merge "Fix bug 4818050 - Need a way to get notified when a PopupMenu gets dismissed/canceled" 2011-06-21 20:58:28 -07:00
Fabrice Di Meglio
48bb369949 Merge "Fix bug #4796027 left/right padding regression after recent View change (part 2)" 2011-06-21 19:49:41 -07:00
Svetoslav Ganov
66fc6b4f8f Merge "Searching for AccessibilityNodeInfo by text not case insensitive." 2011-06-21 18:12:15 -07:00
Fabrice Di Meglio
15c402a8ff Merge "Fix bug #4796027 left/right padding regression after recent View change" 2011-06-21 17:55:50 -07:00
Svetoslav Ganov
490f9f1a1c Merge "Touch exploration hover events don't map coordinates correctly on scrollable WebViews." 2011-06-21 17:54:17 -07:00
Svetoslav Ganov
83f99eca72 Merge "AccessiblityNodeInfo#findAccessibilityNodesByText returns null if non found." 2011-06-21 17:41:19 -07:00
Jason Sams
929b9161a4 Merge "Fix bugs in AllocationAdapter." 2011-06-21 17:14:09 -07:00
James Dong
8f692d8227 Merge "Timestamp adjustment will not work well if we ask video encoder to produce B frames" 2011-06-21 17:13:57 -07:00
Jason Sams
bd085fa83c Merge "First cut of atomics for renderscript." 2011-06-21 17:11:04 -07:00
Stephen Hines
cba6892047 Merge "Support missing RS vector types." 2011-06-21 16:35:39 -07:00
Andy McFadden
f399716add Merge "Port EventRecurrence.parse() from native" 2011-06-21 16:09:50 -07:00
Robert Ly
33b37ee983 am b2dba991: am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'b2dba9910b6bcd26d4d5318b9ee63668ecf39e66':
  cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-21 15:29:07 -07:00
Robert Ly
94ceb1156c am 5520ec6f: am 152e5f56: am 329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '5520ec6f8958d9030a4c9b606b25be6190c75a08':
  cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
2011-06-21 15:28:26 -07:00
Jean-Baptiste Queru
d871b3ac28 am 49b73385: am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '49b73385146cb566e242c63abc3c3781750bec43':
  Tweaks for forward-compatibility
2011-06-21 15:28:12 -07:00
Adam Powell
dc1733beef Merge "Fix bug 4725323 - 'More' shows the icons which are already available in settings" 2011-06-21 15:17:41 -07:00
Andreas Huber
d19005db43 Merge "Log an error instead of asserting if the OMX plugin reports an error." 2011-06-21 15:01:22 -07:00
Jamie Gennis
fcc25ef933 Merge "SurfaceTexture: make tests use a large framebuffer." 2011-06-21 14:40:29 -07:00
Gloria Wang
b340b3a22b Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217." 2011-06-21 13:19:36 -07:00
Xavier Ducrohet
25bc0a8146 Merge "Add missing delegate to the layoutlib." 2011-06-21 12:19:07 -07:00
Andreas Huber
0a37beb8df Merge "Don't assert on malformed .mp4 content that contains fewer samples than" 2011-06-21 12:13:41 -07:00
James Dong
7457062692 Merge "Boost software vp8 decoder performance using multi-threaded decoding if possible" 2011-06-21 12:12:06 -07:00
Andreas Huber
950ba96ad3 Merge "Parse the individual segment's duration as a floating point number which is now" 2011-06-21 12:07:47 -07:00
Daniel Sandler
67eb5be994 Merge "Fix statusbar crash when DeskClock alarms go off." 2011-06-21 11:55:13 -07:00
Jaikumar Ganesh
50cf4a338d Merge "Fix crash during unpair." 2011-06-21 11:44:32 -07:00
Christopher Tate
2fee5ddf10 Merge "Pass the data fd number as a command line argument to 'bu'" 2011-06-21 11:40:48 -07:00
Jaikumar Ganesh
43352460fb Merge "Fix failure of Opp." 2011-06-21 11:37:47 -07:00
Brett Chabot
04c5ef6894 Merge "Include testdata in layoutlib-tests." 2011-06-21 11:27:29 -07:00
Gilles Debunne
05fee3b28e Merge "Support for arbitrary ListAdapter in PreferenceActivity." 2011-06-21 11:16:35 -07:00
Ben Murdoch
7de9bebbcd Merge changes I465dd712,Ifd607b0c
* changes:
  Update Android DRT skip list.
  LayoutTests with dumpAsText in the pathname should always dump as text.
2011-06-21 10:14:16 -07:00