OSDN Git Service
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
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."
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.""
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"
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."
Jeff Brown [Fri, 17 Feb 2012 03:49:03 +0000 (19:49 -0800)]
Merge "Improve MessageQueue sync barrier implementation."
Jeff Brown [Fri, 17 Feb 2012 03:43:43 +0000 (19:43 -0800)]
Merge "Encapsulate the ViewRootImpl's handler."
Bart Sears [Fri, 17 Feb 2012 02:01:38 +0000 (18:01 -0800)]
Merge "New version of DroidSansFallback"
Dianne Hackborn [Fri, 17 Feb 2012 02:01:31 +0000 (18:01 -0800)]
Merge "Revert "Don't wait for current activity to pause before resuming next.""
Fabrice Di Meglio [Fri, 17 Feb 2012 00:58:47 +0000 (16:58 -0800)]
Merge "Improve textDirection APIs"
Romain Guy [Fri, 17 Feb 2012 00:52:53 +0000 (16:52 -0800)]
Merge "Ensure we always reset graphics modifiers Bug #
6025838"
Fabrice Di Meglio [Thu, 16 Feb 2012 23:50:39 +0000 (15:50 -0800)]
Merge "Fix Javadoc for View"
Amith Yamasani [Thu, 16 Feb 2012 23:48:14 +0000 (15:48 -0800)]
Merge "Fix Power Control widget"
John Grossman [Thu, 16 Feb 2012 23:28:44 +0000 (15:28 -0800)]
Merge "Really fix the build this time."
Selim Gurun [Thu, 16 Feb 2012 23:13:12 +0000 (15:13 -0800)]
Merge "Act on credential storage updates."
John Grossman [Thu, 16 Feb 2012 22:57:54 +0000 (14:57 -0800)]
Merge "Fix the build."
Dianne Hackborn [Thu, 16 Feb 2012 22:48:53 +0000 (14:48 -0800)]
am
e669d666: am
1db7eeac: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
e669d6666ae0c41742716bc2564266c1bab3f855':
Dianne Hackborn [Thu, 16 Feb 2012 22:48:48 +0000 (14:48 -0800)]
am
804aa297: am
01810bbb: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
804aa297950949985882e4841303cd6e12fae06e':
Fix last change -- don't call startInputInner() with lock held.
Dianne Hackborn [Thu, 16 Feb 2012 22:46:41 +0000 (14:46 -0800)]
am
1db7eeac: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
1db7eeac74d1455991e1dc0f532b47276d0c679c':
Dianne Hackborn [Thu, 16 Feb 2012 22:45:57 +0000 (14:45 -0800)]
am
01810bbb: am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
Fix last change -- don't call startInputInner() with lock held.
Dianne Hackborn [Thu, 16 Feb 2012 22:44:03 +0000 (14:44 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
Dianne Hackborn [Thu, 16 Feb 2012 22:43:43 +0000 (14:43 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
Fabrice Di Meglio [Thu, 16 Feb 2012 22:36:28 +0000 (14:36 -0800)]
Merge "Add View.onResolvePadding() as a public API"
Svetoslav Ganov [Thu, 16 Feb 2012 22:18:46 +0000 (14:18 -0800)]
Merge "Fixing the build."
Svetoslav Ganov [Thu, 16 Feb 2012 21:06:29 +0000 (13:06 -0800)]
Merge "Adding shell commands for modifying content."
The Android Open Source Project [Thu, 16 Feb 2012 19:25:37 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:16 +0000 (11:25 -0800)]
Justin Ho [Thu, 16 Feb 2012 19:25:01 +0000 (11:25 -0800)]
am
f581e486: am
eefef982: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
f581e4868b3443c6ee9a463a879ed398fb3648c9':
Justin Ho [Thu, 16 Feb 2012 19:24:59 +0000 (11:24 -0800)]
am
8ff0c4cb: am
727ba648: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
8ff0c4cb320110e4f2d682ef352ef3eb6e0296c8':
Justin Ho [Thu, 16 Feb 2012 19:24:57 +0000 (11:24 -0800)]
am
c3132a0b: am
ac18f89c: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
c3132a0b1ec23956ada3def4d5702f6149c68336':
Update WiMAX notification icons Bug:
5724605
Eric Laurent [Thu, 16 Feb 2012 18:30:51 +0000 (10:30 -0800)]
Merge "Fix music volume regression on tablets"
Mike Lockwood [Thu, 16 Feb 2012 18:15:32 +0000 (10:15 -0800)]
Merge "WifiStateTracker: add support for overriding DCHP max retry count in an overlay"
Mike Lockwood [Thu, 16 Feb 2012 18:15:16 +0000 (10:15 -0800)]
Merge "Remove airplane mode related wifi test for Wi-Fi only devices."
The Android Open Source Project [Thu, 16 Feb 2012 18:13:52 +0000 (10:13 -0800)]
am
e113e793: Reconcile with ics-mr1-release
* commit '
e113e793b32ca4c7fe41de41c40a34c494b4c783':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:13 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
The Android Open Source Project [Thu, 16 Feb 2012 18:04:19 +0000 (10:04 -0800)]
am
9777fb10: Reconcile with ics-mr1-release
* commit '
9777fb106f3705e2a9610c4f9020d7f68941d83c':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:15 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
Justin Ho [Thu, 16 Feb 2012 17:44:03 +0000 (09:44 -0800)]
am
eefef982: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
eefef98226682a1a6f4458c955b611c69b11068e':
Justin Ho [Thu, 16 Feb 2012 17:43:57 +0000 (09:43 -0800)]
am
727ba648: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
727ba648d66bbeeb003803afcb380cf91bcd9966':
The Android Automerger [Thu, 16 Feb 2012 17:40:11 +0000 (09:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:31:31 +0000 (09:31 -0800)]
am
ac18f89c: am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
ac18f89cf5ac8a2a63223c28139f6697d974e533':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:29:53 +0000 (09:29 -0800)]
am
09170888: am
cc1bd4bb: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
09170888cbc501cd9819b1caccc99592bc6dd73f':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:29:07 +0000 (09:29 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Alex Sakhartchouk [Thu, 16 Feb 2012 17:28:21 +0000 (09:28 -0800)]
Merge "Piping texture names through shader builder. Fixing uint size_t mismatch."
Justin Ho [Thu, 16 Feb 2012 17:28:12 +0000 (09:28 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:27:16 +0000 (09:27 -0800)]
am
cc1bd4bb: am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
cc1bd4bbbc7314ab7d3ba015c16ea78cbfd6459f':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:25:03 +0000 (09:25 -0800)]
am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
Part of fixing issue #
6006757: Keyboard dismissal lags