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
Johannes Carlsson
80f12a75f2
am 73fef3c7: am b5a8654d: Clear reference to the IIntentReceiver in order to avoid memory leak
...
* commit '73fef3c7c0986468d75e3ef09d2255c3509a80c9':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 22:48:05 -08:00
Dianne Hackborn
b9ea2cd1b1
am 4302886f: am c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
...
* commit '4302886f8f77c3f53cdc094069f3550dd56bc812':
Avoiding cyclic references when unbinding from a service
2011-01-05 22:48:00 -08:00
Adam Powell
b242d6f1ec
Merge "Fix bug 3326380 - ListView motion scrolling stops too early when list is padded"
2011-01-05 22:38:35 -08:00
Brian Carlstrom
266814c618
Merge "Import libcore_to_document definition from libcore/Docs.mk"
2011-01-05 21:53:32 -08:00
Dianne Hackborn
de5c33a890
Merge "Implement issue #3326435 : Battery stats improvements"
2011-01-05 21:35:56 -08:00
Adam Powell
5acb9b4f59
Merge "Fix bug 3242965 - Unreadable text in context menus using legacy theme"
2011-01-05 21:10:16 -08:00
Joe Onorato
15942e9a57
Merge "Make the volume keys adjust the media volume by default if the device is not "voice capable.""
2011-01-05 20:53:14 -08:00
Joe Onorato
7b4bea8497
Merge "Fix the 3G icon shows as G."
2011-01-05 20:53:05 -08:00
Dianne Hackborn
c414fb98ac
am 3769240b: Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
...
* commit '3769240b7976bfa50bb7bf235747b7f6bb7be08e':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 19:28:33 -08:00
Johannes Carlsson
37d9aaceea
am b5a8654d: Clear reference to the IIntentReceiver in order to avoid memory leak
...
* commit 'b5a8654dea9ea8443b41f8ff3668ae4074e13a07':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 19:13:29 -08:00
Dianne Hackborn
611040bae9
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
2011-01-05 19:10:15 -08:00
Dianne Hackborn
dc70fde034
am c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
...
* commit 'c91f9fe542fd1ca9d6da432faeba60d35c4d5c49':
Avoiding cyclic references when unbinding from a service
2011-01-05 18:55:57 -08:00
Dianne Hackborn
c0cb771cab
Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
2011-01-05 18:54:19 -08:00
James Dong
adbc5e9e44
am a8ce7736: am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
...
* commit 'a8ce773607c26dd4336f57856afce507fb98a279':
Suppress the recording sound in the recorded video
2011-01-05 17:57:55 -08:00
James Dong
54f6bb5718
am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
...
* commit '35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
2011-01-05 17:55:27 -08:00
James Dong
da57245bae
Merge "Suppress the recording sound in the recorded video" into gingerbread
2011-01-05 17:53:18 -08:00
Justin Ho
d4759b8b00
Merge "Updated HDPI assets from Gingerbread"
2011-01-05 17:50:26 -08:00
Robert Greenwalt
99266b1e79
Merge "Allow bumpDns() to execute correctly before boot has completed"
2011-01-05 17:47:18 -08:00
Jean-Michel Trivi
06646a91dd
Merge "Add support in TTS for volume and panning control of the synth output"
2011-01-05 17:36:46 -08:00
Justin Ho
ea3a91918f
Merge "Updated presence icons and new emergency icon"
2011-01-05 17:27:04 -08:00
Adam Powell
37dfd474cb
Merge "Fix Holo Spinners"
2011-01-05 17:10:56 -08:00
Justin Ho
2bf00e44d0
Merge "Updated assets from gingerbread"
2011-01-05 17:00:26 -08:00
Andreas Huber
98aa1b9a42
Merge "Some more fixes regarding HTTP live in NuPlayer."
2011-01-05 16:34:06 -08:00
Brian Muramatsu
62319b5c78
Merge "Add MipmapDrawableTest"
2011-01-05 15:19:38 -08:00
Amith Yamasani
c1b00211bd
Merge "Use an opaque background for the search bar in legacy SearchDialog."
2011-01-05 15:17:50 -08:00
Jeff Brown
932a2f1241
Merge "Add dispatch key shortcut window callback."
2011-01-05 14:52:07 -08:00
Andreas Huber
7d5ac774bd
Merge "Seek/Duration support for completed http live streams in NuPlayer."
2011-01-05 14:50:00 -08:00
Brad Fitzpatrick
8b03f74d4c
resolved conflicts for merge of 3a2c6bf0 to master
...
Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe
2011-01-05 14:04:06 -08:00
Brad Fitzpatrick
d02d09416d
am 69ea4e15: Documentation fixes found over vacation hacking.
...
* commit '69ea4e15e52c456537575d21443ac1efdb03a902':
Documentation fixes found over vacation hacking.
2011-01-05 13:52:53 -08:00
Jeff Brown
57e9f2615b
Merge "Only allow touch events from one device at a time."
2011-01-05 13:44:05 -08:00
Shimeng (Simon) Wang
01ee482278
Merge "Refactor zoom overview width calculation."
2011-01-05 13:05:29 -08:00