OSDN Git Service
The Android Open Source Project [Thu, 23 Feb 2012 15:29:21 +0000 (07:29 -0800)]
Jean-Baptiste Queru [Thu, 23 Feb 2012 15:29:15 +0000 (07:29 -0800)]
am
50ff08a2: am
8a33803d: am
a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons"
* commit '
50ff08a24e7a94c196f9b5c0b5b9ebdc03064a36':
Increase PDU parts buffer size for performance reasons
The Android Open Source Project [Thu, 23 Feb 2012 15:29:06 +0000 (07:29 -0800)]
Marc Blank [Thu, 23 Feb 2012 15:28:54 +0000 (07:28 -0800)]
am
cedcdc98: (-s ours) am
d3ea7331: am
094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit '
cedcdc984cf36d3b3aeca359b4866e5680427c51':
Marc Blank [Thu, 23 Feb 2012 15:28:51 +0000 (07:28 -0800)]
am
cdbf0efc: (-s ours) am
970c74ac: am
094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit '
cdbf0efcdc42ea0ef7290c4d73da16f596c8e8be':
Use ' for apostrophe in HTML encoding DO NOT MERGE
Steve Block [Thu, 23 Feb 2012 12:29:30 +0000 (04:29 -0800)]
Merge "Drop support for Android HTTP stack"
Gilles Debunne [Thu, 23 Feb 2012 02:27:27 +0000 (18:27 -0800)]
Merge "Fixed comment for selectAllOnFocus"
George Mount [Thu, 23 Feb 2012 01:33:03 +0000 (17:33 -0800)]
Merge "Characters sent directly to InputConnection treated as changes."
Svetoslav Ganov [Thu, 23 Feb 2012 00:49:36 +0000 (16:49 -0800)]
Merge "Add check for no children in VIew hosting virtual view tree."
George Mount [Thu, 23 Feb 2012 00:02:30 +0000 (16:02 -0800)]
Merge "Changes that don't map to keys sent as text changes."
Dima Zavin [Thu, 23 Feb 2012 00:00:49 +0000 (16:00 -0800)]
Merge "libui: add ability to force a framebuffer format for EGL's use"
Dima Zavin [Wed, 22 Feb 2012 22:37:57 +0000 (14:37 -0800)]
libui: add ability to force a framebuffer format for EGL's use
This does not actually change the framebuffer format. It merely
fakes this format to surfaceflinger so that when it creates
framebuffer surfaces it will use this format. It's really a giant
HACK to allow interworking with buggy gralloc+GPU driver
implementations. You should *NEVER* need to set this for shipping
devices.
Change-Id: I03eeb5b4d72838ef219df386ecc489fc20ab9cc7
Signed-off-by: Dima Zavin <dima@android.com>
John Reck [Wed, 22 Feb 2012 23:39:23 +0000 (15:39 -0800)]
Merge "Fix drawing focus node rect in touch mode"
George Mount [Wed, 22 Feb 2012 23:17:00 +0000 (15:17 -0800)]
Merge "Add caret thumb following selection handle logic."
Andreas Huber [Wed, 22 Feb 2012 23:13:44 +0000 (15:13 -0800)]
Merge "Implementation of a java media codec interface and associated tools."
Romain Guy [Wed, 22 Feb 2012 22:36:28 +0000 (14:36 -0800)]
Merge "Reduce logs"
Gilles Debunne [Wed, 22 Feb 2012 22:30:43 +0000 (14:30 -0800)]
Merge "EditText-specific data extracted from TextView"
Gilles Debunne [Wed, 22 Feb 2012 22:18:17 +0000 (14:18 -0800)]
Merge "Added bottom padding in textview's focused rectangle"
Alex Sakhartchouk [Wed, 22 Feb 2012 22:10:58 +0000 (14:10 -0800)]
Merge "Simplifying programmatic creation."
Alex Sakhartchouk [Wed, 22 Feb 2012 22:10:45 +0000 (14:10 -0800)]
Merge "Properly pipe texture names through."
James Dong [Wed, 22 Feb 2012 22:00:38 +0000 (14:00 -0800)]
Merge "Removed out-of-date TODO in video editor performance/stress test cases"
Glenn Kasten [Wed, 22 Feb 2012 21:22:13 +0000 (13:22 -0800)]
Merge "Avoid wp<>::unsafe_get() with a few exceptions"
Eric Fischer [Wed, 22 Feb 2012 21:17:22 +0000 (13:17 -0800)]
Merge "Import translations. DO NOT MERGE"
Glenn Kasten [Wed, 22 Feb 2012 21:14:50 +0000 (13:14 -0800)]
Merge "Fix build warning"
Daisuke Miyakawa [Wed, 22 Feb 2012 21:06:58 +0000 (13:06 -0800)]
Merge "Remove the entire PIM directory."
Svetoslav Ganov [Wed, 22 Feb 2012 20:51:35 +0000 (12:51 -0800)]
Merge "Fixing the content build file to include the command on user builds."
Adam Powell [Wed, 22 Feb 2012 20:22:31 +0000 (12:22 -0800)]
Merge "Fix bug
6048643 - verify ListView layoutparams while tracking stable IDs"
James Dong [Wed, 22 Feb 2012 19:47:07 +0000 (11:47 -0800)]
Merge "Allow to record time lapse videos without using setProfile()"
John Reck [Wed, 22 Feb 2012 18:18:43 +0000 (10:18 -0800)]
Merge "Turn off the focus animation"
John Reck [Wed, 22 Feb 2012 17:43:27 +0000 (09:43 -0800)]
Merge "Add null parent check to startActionMode"
Marco Nelissen [Wed, 22 Feb 2012 17:42:54 +0000 (09:42 -0800)]
Merge "Eliminate scanner file cache"
Eric Fischer [Wed, 22 Feb 2012 17:34:09 +0000 (09:34 -0800)]
Merge "Import translations. DO NOT MERGE"
Steve Block [Wed, 22 Feb 2012 17:23:04 +0000 (09:23 -0800)]
Merge "Remove unused cache methods"
Alex Sakhartchouk [Wed, 22 Feb 2012 17:02:53 +0000 (09:02 -0800)]
Merge "Adding a very simple all-code scenegraph example."
Craig Mautner [Wed, 22 Feb 2012 15:53:43 +0000 (07:53 -0800)]
Merge "- Consolidate all animations in a single place outside of layout loop. - Move mPolicy.startAnimationLw and mPolicy.finishAnimationLw into same method as mPolicy.animatingWindowLw. - Fix first parameter of performLayoutLockedInner(initial, ...) to pass true on initial pass."
satok [Wed, 22 Feb 2012 06:59:12 +0000 (22:59 -0800)]
Merge "Refactor sentence level spell checking APIs"
Mathias Agopian [Wed, 22 Feb 2012 02:58:32 +0000 (18:58 -0800)]
Merge "remove libui's dependency on libpixelflinger"
Mathias Agopian [Wed, 22 Feb 2012 02:56:08 +0000 (18:56 -0800)]
remove libui's dependency on libpixelflinger
this also remove support for unused pixelformats.
Change-Id: I2c759a6d2daa740f3786ed62095def8047ae933d
Romain Guy [Wed, 22 Feb 2012 02:33:58 +0000 (18:33 -0800)]
Merge "Only copy paths, paints and shaders when we need to."
Adam Powell [Wed, 22 Feb 2012 01:19:29 +0000 (17:19 -0800)]
Merge "Fix bug
5971117 - Action bar does not update icon used for collapsible action views"
Svetoslav Ganov [Wed, 22 Feb 2012 01:17:33 +0000 (17:17 -0800)]
Merge "Improving accessibility APIs used for UI automation."
Mathias Agopian [Wed, 22 Feb 2012 00:57:14 +0000 (16:57 -0800)]
Merge "attempt to fix sdk build"
Nicolas Roard [Wed, 22 Feb 2012 00:06:36 +0000 (16:06 -0800)]
Merge "Simplify Youtube <embed> management"
Alex Sakhartchouk [Tue, 21 Feb 2012 23:52:47 +0000 (15:52 -0800)]
Merge "Adding better default behaviour for programmatically created objects."
Adam Powell [Tue, 21 Feb 2012 23:51:23 +0000 (15:51 -0800)]
Merge "Fix the size of DialogWhenLarge windows"
John Reck [Tue, 21 Feb 2012 23:43:38 +0000 (15:43 -0800)]
Merge "Improved keyboard navigation cursor rings"
Adam Powell [Tue, 21 Feb 2012 23:39:00 +0000 (15:39 -0800)]
Merge "Have View call setPressed explicitly instead of just twiddling flags."
Mathias Agopian [Tue, 21 Feb 2012 20:52:06 +0000 (12:52 -0800)]
Merge "frameworks/base refactoring"
Victoria Lease [Tue, 21 Feb 2012 19:33:42 +0000 (11:33 -0800)]
Merge "async find-on-page implementation via WebKit"
James Dong [Tue, 21 Feb 2012 19:10:46 +0000 (11:10 -0800)]
Merge "Added checks for illegal arguments"
James Dong [Tue, 21 Feb 2012 19:10:35 +0000 (11:10 -0800)]
Merge "Limit the amount of audio record data in each buffer"
Alex Sakhartchouk [Tue, 21 Feb 2012 17:23:17 +0000 (09:23 -0800)]
Merge "Making sure stranded objects are not left behind."
Steve Block [Tue, 21 Feb 2012 17:05:47 +0000 (09:05 -0800)]
Merge "Update stagefright makefile after dropping support for JSC"
Martin Kosiba [Tue, 21 Feb 2012 16:58:21 +0000 (08:58 -0800)]
Merge "Update the JavaDoc on getVisibleTitleHeight."
Steve Block [Tue, 21 Feb 2012 15:44:11 +0000 (07:44 -0800)]
Merge "Clean up JavaDoc for CacheManager"
Steve Block [Tue, 21 Feb 2012 15:43:07 +0000 (07:43 -0800)]
Merge "Fix CacheManager.getCacheFile() with the Chromium HTTP stack"
Glenn Kasten [Tue, 21 Feb 2012 15:24:16 +0000 (07:24 -0800)]
Merge "createSurface getpid() first parameter was removed"
Steve Block [Tue, 21 Feb 2012 11:52:02 +0000 (03:52 -0800)]
Merge "Don't try to use Network timing with the Chromium HTTP stack"
Steve Block [Tue, 21 Feb 2012 11:51:47 +0000 (03:51 -0800)]
Merge "Clean up JavaDoc for WebResourceResponse"
Steve Block [Tue, 21 Feb 2012 10:18:12 +0000 (02:18 -0800)]
Merge "Clean up JavaDoc for CookieManager"
Steve Block [Tue, 21 Feb 2012 10:09:34 +0000 (02:09 -0800)]
Merge "Make LoadListener.willLoadFromCache() private"
Mathias Agopian [Tue, 21 Feb 2012 06:50:36 +0000 (22:50 -0800)]
Merge "SurfaceFlinger: set wrap mode on screenshot texture"
Mathias Agopian [Tue, 21 Feb 2012 00:58:20 +0000 (16:58 -0800)]
frameworks/base refactoring
create the new libandroidfw from parts of libui and libutils
Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
Mathias Agopian [Sat, 18 Feb 2012 03:26:39 +0000 (19:26 -0800)]
Merge "frameworks/base refactoring."
Mathias Agopian [Sat, 18 Feb 2012 02:27:36 +0000 (18:27 -0800)]
frameworks/base refactoring.
step 2: move libutils headers to their new home: androidfw
Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
Jason Sams [Sat, 18 Feb 2012 01:20:27 +0000 (17:20 -0800)]
Merge "Work around VSync signal while screen is off."
Adam Powell [Sat, 18 Feb 2012 01:15:04 +0000 (17:15 -0800)]
Merge "Add transient state tracking to Views"
Jeff Brown [Sat, 18 Feb 2012 00:28:20 +0000 (16:28 -0800)]
Merge "frameworks/base refactoring."
Mathias Agopian [Fri, 17 Feb 2012 23:34:57 +0000 (15:34 -0800)]
frameworks/base refactoring.
First step. Move libui includes to their new home: androidfw.
Change-Id: Ic042b52fdba72f30edc3cc6339bf30b4c1b99662
Romain Guy [Fri, 17 Feb 2012 23:18:14 +0000 (15:18 -0800)]
Merge "Record possible clip rejects when recording display lists"
Siva Velusamy [Fri, 17 Feb 2012 23:05:36 +0000 (15:05 -0800)]
Merge "gltrace: Trace thread time and wall clock time."
Iliyan Malchev [Fri, 17 Feb 2012 22:51:32 +0000 (14:51 -0800)]
Merge "libs/utils: replace malloc() + memset() to zero with calloc()"
Mike Lockwood [Fri, 17 Feb 2012 22:33:27 +0000 (14:33 -0800)]
Merge "Revert "Revert "The com.android.athome api classes are moving android.support.place."""
Iliyan Malchev [Fri, 17 Feb 2012 22:28:38 +0000 (14:28 -0800)]
Merge "bluetooth: replace malloc() + memset() to zero with calloc()"
Iliyan Malchev [Fri, 17 Feb 2012 20:15:58 +0000 (12:15 -0800)]
libs/utils: replace malloc() + memset() to zero with calloc()
Change-Id: I8bdf4360147e51e35c162856c9a859aed6acac34
Signed-off-by: Iliyan Malchev <malchev@google.com>
Romain Guy [Fri, 17 Feb 2012 21:09:19 +0000 (13:09 -0800)]
Merge "Remove unused private APIs"
Eric Fischer [Fri, 17 Feb 2012 20:18:44 +0000 (12:18 -0800)]
Merge "Import translations."
Jason Sams [Fri, 17 Feb 2012 20:05:13 +0000 (12:05 -0800)]
Merge "Update prototype remote fifo. Tested primary connection using only fifo data transport."
Jason Sams [Fri, 17 Feb 2012 20:04:20 +0000 (12:04 -0800)]
Merge "Rename three header files to free namespace for api."
Siva Velusamy [Fri, 17 Feb 2012 18:55:03 +0000 (10:55 -0800)]
gltrace: Trace thread time and wall clock time.
For each gl function, trace both the thread and wall clock
times.
Change-Id: I32b6caa67fa50bf915dab89b3c5021ee82e28d55
The Android Open Source Project [Fri, 17 Feb 2012 18:46:48 +0000 (10:46 -0800)]
am
f5f5d61c: Reconcile with ics-mr1-release
* commit '
f5f5d61c611b6f2c699ba472972e0b5c33c82402':
Glenn Kasten [Fri, 17 Feb 2012 18:45:02 +0000 (10:45 -0800)]
Merge "Remove bit fields to improve performance"
Jeff Brown [Fri, 17 Feb 2012 18:30:50 +0000 (10:30 -0800)]
Merge "Ignore broken input channel when finishing input event."
Jean-Baptiste Queru [Fri, 17 Feb 2012 18:18:49 +0000 (10:18 -0800)]
am
8a33803d: am
a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons"
* commit '
8a33803df5477bb9bd20bfae8c7a7d0833f6d2a9':
Increase PDU parts buffer size for performance reasons
Jean-Baptiste Queru [Fri, 17 Feb 2012 18:13:05 +0000 (10:13 -0800)]
am
a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons"
* commit '
a1ee18f1413471813f36a1d05927f5513c8931f5':
Increase PDU parts buffer size for performance reasons
Philip Milne [Fri, 17 Feb 2012 18:06:47 +0000 (10:06 -0800)]
Merge "Fix remaining issue with bug #
5904777"
Mike Lockwood [Fri, 17 Feb 2012 17:53:30 +0000 (09:53 -0800)]
Merge "Revert "The com.android.athome api classes are moving android.support.place.""
Jean-Baptiste Queru [Fri, 17 Feb 2012 17:53:28 +0000 (09:53 -0800)]
Merge "Increase PDU parts buffer size for performance reasons"
Mike Lockwood [Fri, 17 Feb 2012 17:47:47 +0000 (09:47 -0800)]
Merge "New clock sync control loop."
Glenn Kasten [Fri, 17 Feb 2012 17:40:43 +0000 (09:40 -0800)]
Merge "Simplify code"
Mike Lockwood [Fri, 17 Feb 2012 17:20:43 +0000 (09:20 -0800)]
Merge "Put a bandaid on a segfault in timed audio track handling."
Mike Lockwood [Fri, 17 Feb 2012 17:20:12 +0000 (09:20 -0800)]
Merge "The com.android.athome api classes are moving android.support.place."
Glenn Kasten [Fri, 17 Feb 2012 17:19:49 +0000 (09:19 -0800)]
Merge "Fixed possible heap corruption in EffectDesc"
The Android Open Source Project [Fri, 17 Feb 2012 17:02:50 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
The Android Open Source Project [Fri, 17 Feb 2012 16:13:35 +0000 (08:13 -0800)]
am
c30fdda0: Reconcile with ics-mr1-release
* commit '
c30fdda052e82ca7b014b9817945e465cca78c75':
The Android Open Source Project [Fri, 17 Feb 2012 16:09:34 +0000 (08:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0126d92680a2624881870d7c835b3abd02cd6bab
Eric Fischer [Fri, 17 Feb 2012 05:10:27 +0000 (21:10 -0800)]
Merge "Import translations."
Jeff Brown [Fri, 17 Feb 2012 04:31:29 +0000 (20:31 -0800)]
Merge "Don't throw on EPIPE in consumeBatchedInputEvents."
Christian Robertson [Fri, 17 Feb 2012 03:59:08 +0000 (19:59 -0800)]
Merge "Update DroidNaskh font"
Jeff Brown [Fri, 17 Feb 2012 03:49:14 +0000 (19:49 -0800)]
Merge "Mark input and sensor messages as asynchronous."