OSDN Git Service
Alex Sakhartchouk [Fri, 7 Jan 2011 21:03:07 +0000 (13:03 -0800)]
Merge "Additional loading methods for fonts and a3d files. Cleaned up error messages." into honeycomb
Eric Fischer [Fri, 7 Jan 2011 21:00:17 +0000 (13:00 -0800)]
Merge "Import some unabbreviated translations for large screens." into honeycomb
Marco Nelissen [Fri, 7 Jan 2011 20:43:36 +0000 (12:43 -0800)]
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
Gilles Debunne [Fri, 7 Jan 2011 20:41:10 +0000 (12:41 -0800)]
Merge "Removed XmlAdapters from frameworks." into honeycomb
Vasu Nori [Fri, 7 Jan 2011 20:40:16 +0000 (12:40 -0800)]
Merge "in requery(), when exception is caught, print warning + stacktrace" into honeycomb
Joe Onorato [Fri, 7 Jan 2011 20:08:27 +0000 (12:08 -0800)]
Merge "Mark the veto button GONE for ongoing notifications so they can go into its space." into honeycomb
Adam Powell [Fri, 7 Jan 2011 19:35:15 +0000 (11:35 -0800)]
Merge "Fix bug
3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb
Xavier Ducrohet [Fri, 7 Jan 2011 19:32:00 +0000 (11:32 -0800)]
Merge "LayoutLib: Finish the matrix delegate." into honeycomb
Wink Saville [Fri, 7 Jan 2011 19:00:42 +0000 (11:00 -0800)]
Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb
Romain Guy [Fri, 7 Jan 2011 19:00:20 +0000 (11:00 -0800)]
Merge "Fix typo bug in FrameLayout's measurement code. Bug #
3327185" into honeycomb
Wink Saville [Fri, 7 Jan 2011 18:44:20 +0000 (10:44 -0800)]
Merge "For Cdma a blank plmn is valid to show in some cases." into honeycomb
Eric Fischer [Fri, 7 Jan 2011 18:41:50 +0000 (10:41 -0800)]
Merge "Mark the status bar configuration string untranslatable." into honeycomb
Irfan Sheriff [Fri, 7 Jan 2011 17:37:01 +0000 (09:37 -0800)]
Merge "Use BluetoothAdapter broadcast for coex settings" into honeycomb
Daniel Sandler [Fri, 7 Jan 2011 17:20:09 +0000 (09:20 -0800)]
Merge "Fix stuck-open notification shade." into honeycomb
Daniel Sandler [Fri, 7 Jan 2011 14:34:55 +0000 (06:34 -0800)]
Merge "Remove obsolete strings (rather than fix l10n guidelines)." into honeycomb
Steve Block [Fri, 7 Jan 2011 14:12:08 +0000 (06:12 -0800)]
Merge "Remove some superfluous null-checks when constructing a CacheResult" into honeycomb
Vasu Nori [Fri, 7 Jan 2011 02:57:13 +0000 (18:57 -0800)]
Merge "fix a long-standing 'typo' bug" into honeycomb
Romain Guy [Fri, 7 Jan 2011 02:50:19 +0000 (18:50 -0800)]
Merge "New layers API for Views." into honeycomb
Justin Ho [Fri, 7 Jan 2011 02:34:34 +0000 (18:34 -0800)]
Merge "Updated flightmode stat_sys icon" into honeycomb
Xavier Ducrohet [Fri, 7 Jan 2011 02:14:20 +0000 (18:14 -0800)]
Merge "LayoutLib: fix clipping issues." into honeycomb
Svetoslav Ganov [Fri, 7 Jan 2011 01:55:31 +0000 (17:55 -0800)]
Merge "(cherrypick from master)
3322879 Device soft reboots on enabling and disabling accessibility settings" into honeycomb
Dianne Hackborn [Fri, 7 Jan 2011 01:41:46 +0000 (17:41 -0800)]
Merge "We are now Honeycomb." into honeycomb
Andreas Huber [Fri, 7 Jan 2011 01:33:06 +0000 (17:33 -0800)]
Merge "Fix typo." into honeycomb
Jamie Gennis [Fri, 7 Jan 2011 01:17:54 +0000 (17:17 -0800)]
Merge "Add SurfaceTexture JNI registration." into honeycomb
Robert Greenwalt [Fri, 7 Jan 2011 01:16:48 +0000 (17:16 -0800)]
Merge "Fix handling of multiple possible default networks" into honeycomb
Vasu Nori [Fri, 7 Jan 2011 00:52:35 +0000 (16:52 -0800)]
Merge "in GB requery() didn't throw exceptions (mostly). replicate that in HC" into honeycomb
Joe Onorato [Fri, 7 Jan 2011 00:45:42 +0000 (16:45 -0800)]
Merge changes Ib809d4c5,I05d69da4 into honeycomb
* changes:
This makes the events at the edge of the screen find the button.
some touch event debugging
Jamie Gennis [Fri, 7 Jan 2011 00:37:33 +0000 (16:37 -0800)]
Merge "Update api/current.xml for SurfaceTexture." into honeycomb
Andreas Huber [Fri, 7 Jan 2011 00:37:29 +0000 (16:37 -0800)]
Merge "If the stream for the new bandwidth doesn't have the segment we're looking for..." into honeycomb
Jaikumar Ganesh [Fri, 7 Jan 2011 00:31:15 +0000 (16:31 -0800)]
Merge "Remove auto connection on ACL connection." into honeycomb
Jamie Gennis [Fri, 7 Jan 2011 00:20:56 +0000 (16:20 -0800)]
Merge "Add the SurfaceTexture java class." into honeycomb
Adam Powell [Fri, 7 Jan 2011 00:06:48 +0000 (16:06 -0800)]
Merge "Fix bug
3212471 - Widget.Holo.ActionButton style and friends now 76% more useful" into honeycomb
Shimeng (Simon) Wang [Thu, 6 Jan 2011 23:39:49 +0000 (15:39 -0800)]
Merge "Make sure the reading level scale is within min/max limits." into honeycomb
Chet Haase [Thu, 6 Jan 2011 23:02:51 +0000 (15:02 -0800)]
Merge "Reuse of native display list objects" into honeycomb
Andreas Huber [Thu, 6 Jan 2011 22:30:27 +0000 (14:30 -0800)]
Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycomb
Jaikumar Ganesh [Thu, 6 Jan 2011 22:26:40 +0000 (14:26 -0800)]
Merge "Add temporary hack for keyboards not following spec." into honeycomb
Jaikumar Ganesh [Thu, 6 Jan 2011 22:26:22 +0000 (14:26 -0800)]
Merge "Follow the spec recommendation for keyboard pairing." into honeycomb
Jamie Gennis [Thu, 6 Jan 2011 21:36:47 +0000 (13:36 -0800)]
Merge "Add camera service support for SurfaceTexture." into honeycomb
Andreas Huber [Thu, 6 Jan 2011 21:26:51 +0000 (13:26 -0800)]
Merge "Colorconverter may not support some src/dst bitmap configurations." into honeycomb
Andreas Huber [Thu, 6 Jan 2011 21:26:45 +0000 (13:26 -0800)]
Merge "If we failed to initialize the codec after transitioning to IDLE state, don't assert" into honeycomb
Jamie Gennis [Mon, 20 Dec 2010 19:27:26 +0000 (11:27 -0800)]
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
Jamie Gennis [Mon, 20 Dec 2010 19:21:07 +0000 (11:21 -0800)]
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
Vasu Nori [Thu, 6 Jan 2011 19:37:00 +0000 (11:37 -0800)]
Merge "requery() should close cursorwindow insead of setting it to null." into honeycomb
Vasu Nori [Thu, 6 Jan 2011 19:36:53 +0000 (11:36 -0800)]
Merge "set default mode of WAL to be off." into honeycomb
Adam Powell [Thu, 6 Jan 2011 19:32:51 +0000 (11:32 -0800)]
Merge "Fix bug
3327227 - Adjust overflow menu padding" into honeycomb
Cary Clark [Thu, 6 Jan 2011 19:29:33 +0000 (11:29 -0800)]
Merge "pass enter key to webkit more often" into honeycomb
satok [Thu, 6 Jan 2011 10:40:07 +0000 (02:40 -0800)]
Merge "Check null pointer agressively."
Chia-chi Yeh [Thu, 6 Jan 2011 09:56:27 +0000 (01:56 -0800)]
Merge "Enable built-in echo canceler if available."
Chia-chi Yeh [Thu, 6 Jan 2011 08:10:26 +0000 (00:10 -0800)]
Merge "Do not set back to AudioManager.MODE_NORMAL in SipAudioCall."
Adam Powell [Thu, 6 Jan 2011 07:32:31 +0000 (23:32 -0800)]
Merge "Fix a bug that could cause padded lists to draw dividers incorrectly"
Dianne Hackborn [Thu, 6 Jan 2011 06:48:10 +0000 (22:48 -0800)]
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
Johannes Carlsson [Thu, 6 Jan 2011 06:48:05 +0000 (22:48 -0800)]
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
Dianne Hackborn [Thu, 6 Jan 2011 06:48:00 +0000 (22:48 -0800)]
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
Adam Powell [Thu, 6 Jan 2011 06:38:35 +0000 (22:38 -0800)]
Merge "Fix bug
3326380 - ListView motion scrolling stops too early when list is padded"
Brian Carlstrom [Thu, 6 Jan 2011 05:53:32 +0000 (21:53 -0800)]
Merge "Import libcore_to_document definition from libcore/Docs.mk"
Dianne Hackborn [Thu, 6 Jan 2011 05:35:56 +0000 (21:35 -0800)]
Merge "Implement issue #
3326435: Battery stats improvements"
Adam Powell [Thu, 6 Jan 2011 05:10:16 +0000 (21:10 -0800)]
Merge "Fix bug
3242965 - Unreadable text in context menus using legacy theme"
Joe Onorato [Thu, 6 Jan 2011 04:53:14 +0000 (20:53 -0800)]
Merge "Make the volume keys adjust the media volume by default if the device is not "voice capable.""
Joe Onorato [Thu, 6 Jan 2011 04:53:05 +0000 (20:53 -0800)]
Merge "Fix the 3G icon shows as G."
Dianne Hackborn [Thu, 6 Jan 2011 03:28:33 +0000 (19:28 -0800)]
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
Johannes Carlsson [Thu, 6 Jan 2011 03:13:29 +0000 (19:13 -0800)]
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
Dianne Hackborn [Thu, 6 Jan 2011 03:10:15 +0000 (19:10 -0800)]
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
Dianne Hackborn [Thu, 6 Jan 2011 02:55:57 +0000 (18:55 -0800)]
am
c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
* commit '
c91f9fe542fd1ca9d6da432faeba60d35c4d5c49':
Avoiding cyclic references when unbinding from a service
Dianne Hackborn [Thu, 6 Jan 2011 02:54:19 +0000 (18:54 -0800)]
Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
James Dong [Thu, 6 Jan 2011 01:57:55 +0000 (17:57 -0800)]
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
James Dong [Thu, 6 Jan 2011 01:55:27 +0000 (17:55 -0800)]
am
35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
* commit '
35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
James Dong [Thu, 6 Jan 2011 01:53:18 +0000 (17:53 -0800)]
Merge "Suppress the recording sound in the recorded video" into gingerbread
Justin Ho [Thu, 6 Jan 2011 01:50:26 +0000 (17:50 -0800)]
Merge "Updated HDPI assets from Gingerbread"
Robert Greenwalt [Thu, 6 Jan 2011 01:47:18 +0000 (17:47 -0800)]
Merge "Allow bumpDns() to execute correctly before boot has completed"
Jean-Michel Trivi [Thu, 6 Jan 2011 01:36:46 +0000 (17:36 -0800)]
Merge "Add support in TTS for volume and panning control of the synth output"
Justin Ho [Thu, 6 Jan 2011 01:27:04 +0000 (17:27 -0800)]
Merge "Updated presence icons and new emergency icon"
Adam Powell [Thu, 6 Jan 2011 01:10:56 +0000 (17:10 -0800)]
Merge "Fix Holo Spinners"
Justin Ho [Thu, 6 Jan 2011 01:00:26 +0000 (17:00 -0800)]
Merge "Updated assets from gingerbread"
Andreas Huber [Thu, 6 Jan 2011 00:34:06 +0000 (16:34 -0800)]
Merge "Some more fixes regarding HTTP live in NuPlayer."
Brian Muramatsu [Wed, 5 Jan 2011 23:19:38 +0000 (15:19 -0800)]
Merge "Add MipmapDrawableTest"
Amith Yamasani [Wed, 5 Jan 2011 23:17:50 +0000 (15:17 -0800)]
Merge "Use an opaque background for the search bar in legacy SearchDialog."
Jeff Brown [Wed, 5 Jan 2011 22:52:07 +0000 (14:52 -0800)]
Merge "Add dispatch key shortcut window callback."
Andreas Huber [Wed, 5 Jan 2011 22:50:00 +0000 (14:50 -0800)]
Merge "Seek/Duration support for completed http live streams in NuPlayer."
Brad Fitzpatrick [Wed, 5 Jan 2011 22:04:06 +0000 (14:04 -0800)]
resolved conflicts for merge of
3a2c6bf0 to master
Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe
Brad Fitzpatrick [Wed, 5 Jan 2011 21:52:53 +0000 (13:52 -0800)]
am
69ea4e15: Documentation fixes found over vacation hacking.
* commit '
69ea4e15e52c456537575d21443ac1efdb03a902':
Documentation fixes found over vacation hacking.
Jeff Brown [Wed, 5 Jan 2011 21:44:05 +0000 (13:44 -0800)]
Merge "Only allow touch events from one device at a time."
Shimeng (Simon) Wang [Wed, 5 Jan 2011 21:05:29 +0000 (13:05 -0800)]
Merge "Refactor zoom overview width calculation."
Leon Scroggins [Wed, 5 Jan 2011 20:57:37 +0000 (12:57 -0800)]
Merge "Show the keyboard when opening Find from the menu."
James Dong [Wed, 5 Jan 2011 20:53:13 +0000 (12:53 -0800)]
Merge "Fixed a typo in the enum for unknown camera error message"
Jason parks [Wed, 5 Jan 2011 19:56:42 +0000 (11:56 -0800)]
Merge "Add decryption support to MountService."
Leon Scroggins [Wed, 5 Jan 2011 19:14:58 +0000 (11:14 -0800)]
Merge "Do not open the keyboard when opening Find from CAB."
Patrick Scott [Wed, 5 Jan 2011 19:07:21 +0000 (11:07 -0800)]
Merge "Use the app context to avoid a memory leak."
Romain Guy [Wed, 5 Jan 2011 18:32:15 +0000 (10:32 -0800)]
Merge changes Ia8a15db8,I20ac5203
* changes:
Don't enable hardware acceleration when the app owns the surface. Bug #
3323096
Make FrameLayout support mixed wrap_content/match_parent children. Bug #
3259668
James Dong [Wed, 5 Jan 2011 18:27:55 +0000 (10:27 -0800)]
Merge "Use video output if necessary for timelapse video recording"
Jason Sams [Wed, 5 Jan 2011 07:17:31 +0000 (23:17 -0800)]
Merge "fix build"
Dianne Hackborn [Wed, 5 Jan 2011 06:45:44 +0000 (22:45 -0800)]
Merge "No longer needed."
Jason Sams [Wed, 5 Jan 2011 06:31:15 +0000 (22:31 -0800)]
Merge "Random cleanup"
Jason Sams [Wed, 5 Jan 2011 06:23:05 +0000 (22:23 -0800)]
Merge "unhide renderscript"
Joe Onorato [Wed, 5 Jan 2011 02:54:49 +0000 (18:54 -0800)]
Merge changes I49263df9,Ie733ad38,I84908fd3,Ia4e869b8,I8240e763,Id5704cc5
* changes:
fix the build
Don't re-show the ticker for a notification if they have set FLAG_ONLY_SHOW_ONCE.
Notification.Builder.setAutoCancel() was setting the wrong flag.
Allow taps on the ticker to pass through to the notification target view so the notification panel still opens.
The whole title area of the notification panel should toggle the settings view.
When the number field on a notifications is >100, just say "100+" instead of listing the number.
Nick Pelly [Wed, 5 Jan 2011 02:35:40 +0000 (18:35 -0800)]
am
978e41fc: am
8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '
978e41fccf278bb64c5204d80d8de95c9bf2e3d5':
Fix technology extra naming for IsoDep and NfcB (API part).
Nick Pelly [Wed, 5 Jan 2011 02:33:41 +0000 (18:33 -0800)]
am
8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '
8d98aebe286be0ca963232afce3d5ceec67d3d7a':
Fix technology extra naming for IsoDep and NfcB (API part).
Nick Pelly [Wed, 5 Jan 2011 02:31:19 +0000 (18:31 -0800)]
Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
James Dong [Wed, 5 Jan 2011 02:19:45 +0000 (18:19 -0800)]
Merge "Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java"
Hung-ying Tyan [Wed, 5 Jan 2011 01:49:48 +0000 (17:49 -0800)]
am
05c53067: am
273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
* commit '
05c53067b613796624937214e506c58de817c8fd':
Fix setting audio group mode in SipPhone.
Hung-ying Tyan [Wed, 5 Jan 2011 01:47:47 +0000 (17:47 -0800)]
am
273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
* commit '
273d2ea3f986f1611d2cf303cc5b93f820c14dd3':
Fix setting audio group mode in SipPhone.