Marco Nelissen
0dee43aa27
Merge "Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831" into honeycomb
2011-01-07 12:43:36 -08:00
Gilles Debunne
ffea8ef2f0
Merge "Removed XmlAdapters from frameworks." into honeycomb
2011-01-07 12:41:10 -08:00
Vasu Nori
c01cfbbe0f
Merge "in requery(), when exception is caught, print warning + stacktrace" into honeycomb
2011-01-07 12:40:16 -08:00
Joe Onorato
5cf9ec4c82
Merge "Mark the veto button GONE for ongoing notifications so they can go into its space." into honeycomb
2011-01-07 12:08:27 -08:00
Adam Powell
34053f4d0f
Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb
2011-01-07 11:35:15 -08:00
Xavier Ducrohet
cc78bef2c5
Merge "LayoutLib: Finish the matrix delegate." into honeycomb
2011-01-07 11:32:00 -08:00
Wink Saville
0e2a022657
Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb
2011-01-07 11:00:42 -08:00
Romain Guy
12171e4ffb
Merge "Fix typo bug in FrameLayout's measurement code. Bug #3327185 " into honeycomb
2011-01-07 11:00:20 -08:00
Wink Saville
06b81169b4
Merge "For Cdma a blank plmn is valid to show in some cases." into honeycomb
2011-01-07 10:44:20 -08:00
Eric Fischer
da747b00c0
Merge "Mark the status bar configuration string untranslatable." into honeycomb
2011-01-07 10:41:50 -08:00
Irfan Sheriff
e9fce5e5be
Merge "Use BluetoothAdapter broadcast for coex settings" into honeycomb
2011-01-07 09:37:01 -08:00
Daniel Sandler
6e87895ab3
Merge "Fix stuck-open notification shade." into honeycomb
2011-01-07 09:20:09 -08:00
Daniel Sandler
55ae84018c
Merge "Remove obsolete strings (rather than fix l10n guidelines)." into honeycomb
2011-01-07 06:34:55 -08:00
Steve Block
7750eed670
Merge "Remove some superfluous null-checks when constructing a CacheResult" into honeycomb
2011-01-07 06:12:08 -08:00
Louis Huemiller
734d8d898c
Hardware Composer new and refactored test cases
...
Change-Id: Iabf46fc5d75891f917e06a257470a0e3f2bd3c95
2011-01-06 21:25:50 -08:00
Vasu Nori
f98b1d22e3
Merge "fix a long-standing 'typo' bug" into honeycomb
2011-01-06 18:57:13 -08:00
Romain Guy
897040297e
Merge "New layers API for Views." into honeycomb
2011-01-06 18:50:19 -08:00
Justin Ho
caf1b483a2
Merge "Updated flightmode stat_sys icon" into honeycomb
2011-01-06 18:34:34 -08:00
Xavier Ducrohet
0409a20d18
Merge "LayoutLib: fix clipping issues." into honeycomb
2011-01-06 18:14:20 -08:00
Svetoslav Ganov
3d97431866
Merge "(cherrypick from master) 3322879 Device soft reboots on enabling and disabling accessibility settings" into honeycomb
2011-01-06 17:55:31 -08:00
Dianne Hackborn
ff2e659a86
Merge "We are now Honeycomb." into honeycomb
2011-01-06 17:41:46 -08:00
Andreas Huber
430f39629b
Merge "Fix typo." into honeycomb
2011-01-06 17:33:06 -08:00
Jamie Gennis
b3f632729e
Merge "Add SurfaceTexture JNI registration." into honeycomb
2011-01-06 17:17:54 -08:00
Robert Greenwalt
b8629f6781
Merge "Fix handling of multiple possible default networks" into honeycomb
2011-01-06 17:16:48 -08:00
Vasu Nori
16180aa65d
Merge "in GB requery() didn't throw exceptions (mostly). replicate that in HC" into honeycomb
2011-01-06 16:52:35 -08:00
Joe Onorato
a485e7919f
Merge changes Ib809d4c5,I05d69da4 into honeycomb
...
* changes:
This makes the events at the edge of the screen find the button.
some touch event debugging
2011-01-06 16:45:42 -08:00
Jamie Gennis
a6f6b136a0
Merge "Update api/current.xml for SurfaceTexture." into honeycomb
2011-01-06 16:37:33 -08:00
Andreas Huber
1caa852794
Merge "If the stream for the new bandwidth doesn't have the segment we're looking for..." into honeycomb
2011-01-06 16:37:29 -08:00
Jaikumar Ganesh
96c7ad736c
Merge "Remove auto connection on ACL connection." into honeycomb
2011-01-06 16:31:15 -08:00
Jamie Gennis
d24daf7402
Merge "Add the SurfaceTexture java class." into honeycomb
2011-01-06 16:20:56 -08:00
Adam Powell
56e15cefe8
Merge "Fix bug 3212471 - Widget.Holo.ActionButton style and friends now 76% more useful" into honeycomb
2011-01-06 16:06:48 -08:00
Shimeng (Simon) Wang
eaf73ca003
Merge "Make sure the reading level scale is within min/max limits." into honeycomb
2011-01-06 15:39:49 -08:00
Chet Haase
505869ae44
Merge "Reuse of native display list objects" into honeycomb
2011-01-06 15:02:51 -08:00
Andreas Huber
27fd0a6c80
Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycomb
2011-01-06 14:30:27 -08:00
Jaikumar Ganesh
789aeac09e
Merge "Add temporary hack for keyboards not following spec." into honeycomb
2011-01-06 14:26:40 -08:00
Jaikumar Ganesh
3bd7b75c95
Merge "Follow the spec recommendation for keyboard pairing." into honeycomb
2011-01-06 14:26:22 -08:00
Jamie Gennis
ee9b133d31
Merge "Add camera service support for SurfaceTexture." into honeycomb
2011-01-06 13:36:47 -08:00
Andreas Huber
90e187d2cf
Merge "Colorconverter may not support some src/dst bitmap configurations." into honeycomb
2011-01-06 13:26:51 -08:00
Andreas Huber
3ba0c902eb
Merge "If we failed to initialize the codec after transitioning to IDLE state, don't assert" into honeycomb
2011-01-06 13:26:45 -08:00
Jamie Gennis
8ba32fade1
Add the SurfaceTexture C++ implementation.
...
This change adds the C++ implementation of SurfaceTexture and related
classes. The goal of this is for a SurfaceTexture to be passed to
camera service or Stagefright in place of a Surface to allow camera
preview or decoded video frames to be streamed to an OpenGL ES texture
that an application can use.
Change-Id: I55c83a7017f1ecb81c9c9e3252cbd118b914296c
2011-01-06 13:20:47 -08:00
Jamie Gennis
4956334065
Add the ISurfaceComposer::createGraphicBuffer IPC.
...
This change adds a new binder method to the ISurfaceComposer interface.
This IPC is intended to allow SurfaceFlinger clients to allocate gralloc
buffers using SurfaceFlinger as a proxy to gralloc.
Change-Id: Ide9fc283aec5da6268ba62cfed0c3319a50b640d
2011-01-06 13:12:35 -08:00
Vasu Nori
0383fbf4f6
Merge "requery() should close cursorwindow insead of setting it to null." into honeycomb
2011-01-06 11:37:00 -08:00
Vasu Nori
dabe7de08e
Merge "set default mode of WAL to be off." into honeycomb
2011-01-06 11:36:53 -08:00
Adam Powell
c451ce6f27
Merge "Fix bug 3327227 - Adjust overflow menu padding" into honeycomb
2011-01-06 11:32:51 -08:00
Cary Clark
bd9886468d
Merge "pass enter key to webkit more often" into honeycomb
2011-01-06 11:29:33 -08:00
satok
d41ed1884a
Merge "Check null pointer agressively."
2011-01-06 02:40:07 -08:00
Chia-chi Yeh
ee4a336736
Merge "Enable built-in echo canceler if available."
2011-01-06 01:56:27 -08:00
Chia-chi Yeh
5e1ddb2742
Merge "Do not set back to AudioManager.MODE_NORMAL in SipAudioCall."
2011-01-06 00:10:26 -08:00
Adam Powell
3a954bcf1c
Merge "Fix a bug that could cause padded lists to draw dividers incorrectly"
2011-01-05 23:32:31 -08:00
Dianne Hackborn
2461c1de8e
am c042eb77: am 3769240b: Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
...
* commit 'c042eb77a5e4c3cb4f2a886d61cff17e1c9b5aed':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 22:48:10 -08:00
