OSDN Git Service
The Android Open Source Project [Thu, 23 Feb 2012 19:20:16 +0000 (11:20 -0800)]
The Android Open Source Project [Thu, 23 Feb 2012 19:19:58 +0000 (11:19 -0800)]
Dianne Hackborn [Thu, 23 Feb 2012 19:19:50 +0000 (11:19 -0800)]
am
536a3b18: am
f08beab2: am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
536a3b185bb0a2f7bc11b78e00123ee502c99f2f':
Dianne Hackborn [Thu, 23 Feb 2012 18:54:06 +0000 (10:54 -0800)]
resolved conflicts for merge of
210c1a26 to master
Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
Dianne Hackborn [Thu, 23 Feb 2012 18:45:11 +0000 (10:45 -0800)]
Merge "Fix issue #
6049410: 3rd party app crashing in JB: Uber"
Stephen Hines [Thu, 23 Feb 2012 17:58:56 +0000 (09:58 -0800)]
Merge "Support running ForEach on non-root functions."
Gilles Debunne [Thu, 23 Feb 2012 17:26:25 +0000 (09:26 -0800)]
Merge "Updated min/maxLines and singleLine documentation"
Andreas Huber [Thu, 23 Feb 2012 17:13:45 +0000 (09:13 -0800)]
Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass"
Jean-Baptiste Queru [Thu, 23 Feb 2012 16:35:03 +0000 (08:35 -0800)]
am
ad3102d0: am
f3d94b44: am
a91b052e: am
fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit '
ad3102d06bc6060f739e0803d0e45dec8020703b':
Call onTimeChanged when AM/PM changed.
Tsu Chiang Chuang [Thu, 23 Feb 2012 16:34:56 +0000 (08:34 -0800)]
am
7b306ae2: am
90cfe0f2: am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
7b306ae225b0a7337972f4d8bff51e8f79be3a03':
Tsu Chiang Chuang [Thu, 23 Feb 2012 16:34:44 +0000 (08:34 -0800)]
am
c16d9de7: am
a626f8d6: am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
c16d9de72996950ec7f55af80d2864cd2abad1c2':
fix NPE in race condition.
Adam Powell [Thu, 23 Feb 2012 15:30:09 +0000 (07:30 -0800)]
am
49913d8c: am
8035db11: am
482ae5f2: Bug
6021294 - Contextual action bar animation tweaks
* commit '
49913d8c60a2add8989435bcda532959e86f99b1':
Adam Powell [Thu, 23 Feb 2012 15:30:01 +0000 (07:30 -0800)]
am
c0d0dddc: am
fef000e3: am
482ae5f2: Bug
6021294 - Contextual action bar animation tweaks
* commit '
c0d0dddc20827846dcf3235f7307ad76d2893ba6':
Bug
6021294 - Contextual action bar animation tweaks
Jean-Baptiste Queru [Thu, 23 Feb 2012 15:29:46 +0000 (07:29 -0800)]
am
058bd2ec: am
1d4c4d42: am
44c1f012: Merge "Return error code when composing PDU fails"
* commit '
058bd2ecbcf8057511b00685eddc4ff5061bdbc1':
Return error code when composing PDU fails
Jean-Baptiste Queru [Thu, 23 Feb 2012 15:29:42 +0000 (07:29 -0800)]
am
4b3ec09b: am
99ccf407: am
c2461eb3: Merge "Add support for bmp and wav content types in MMS"
* commit '
4b3ec09b8199d3c70fbb025a73e8f0a46dcd22c9':
Add support for bmp and wav content types in MMS
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."
The Android Open Source Project [Tue, 21 Feb 2012 23:17:26 +0000 (15:17 -0800)]
am
6815d49c: Reconcile with ics-mr1-release
* commit '
6815d49cfa1ee74ffc8e9640e42d0fd1a7592286':
The Android Open Source Project [Tue, 21 Feb 2012 23:13:30 +0000 (15:13 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic0dc3fd4a476aecd8854c8a919ba1e096cc938f0
The Android Open Source Project [Tue, 21 Feb 2012 23:10:34 +0000 (15:10 -0800)]
am
8013fd39: Reconcile with ics-mr1-release
* commit '
8013fd391e0354c58b193373f5d2db2a22f94081':
The Android Open Source Project [Tue, 21 Feb 2012 23:06:33 +0000 (15:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I21e41892b352f1deeb7bef163d6b99217bb24a6b
Dianne Hackborn [Tue, 21 Feb 2012 23:00:40 +0000 (15:00 -0800)]
am
f08beab2: am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
f08beab2d10bda159722aea6b01bf4320cff6480':
Dianne Hackborn [Tue, 21 Feb 2012 22:59:38 +0000 (14:59 -0800)]
am
2aae2d96: am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
2aae2d9633dab528b74fb4d9c8266d82638e05ff':
Fix issue #
6037252: Screen shifts after all apps are upgraded
Dianne Hackborn [Tue, 21 Feb 2012 22:57:55 +0000 (14:57 -0800)]
am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
Fix issue #
6037252: Screen shifts after all apps are upgraded
Dianne Hackborn [Tue, 21 Feb 2012 22:57:46 +0000 (14:57 -0800)]
am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
Fix issue #
6037252: Screen shifts after all apps are upgraded
Mathias Agopian [Tue, 21 Feb 2012 20:52:06 +0000 (12:52 -0800)]
Merge "frameworks/base refactoring"
Jean-Baptiste Queru [Tue, 21 Feb 2012 20:33:20 +0000 (12:33 -0800)]
am
f3d94b44: am
a91b052e: am
fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit '
f3d94b4425615c08c3f9891726f0753142ce54de':
Call onTimeChanged when AM/PM changed.
Jean-Baptiste Queru [Tue, 21 Feb 2012 20:30:46 +0000 (12:30 -0800)]
am
a91b052e: am
fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit '
a91b052e16196436fcd3a24caa894718db4d10d6':
Call onTimeChanged when AM/PM changed.
Jean-Baptiste Queru [Tue, 21 Feb 2012 20:28:38 +0000 (12:28 -0800)]
am
fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit '
fc24982a44d2b2b678fe5aa212b2e709d10e6413':
Call onTimeChanged when AM/PM changed.
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"
Jean-Baptiste Queru [Tue, 21 Feb 2012 15:21:50 +0000 (07:21 -0800)]
Merge "Call onTimeChanged when AM/PM changed."
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
Tsu Chiang Chuang [Sun, 19 Feb 2012 15:46:04 +0000 (07:46 -0800)]
am
90cfe0f2: am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
90cfe0f2f1e0e54c876157862abc0a588ef84b93':
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"
The Android Automerger [Sat, 18 Feb 2012 00:38:41 +0000 (16:38 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Brown [Sat, 18 Feb 2012 00:28:20 +0000 (16:28 -0800)]
Merge "frameworks/base refactoring."
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:58:12 +0000 (15:58 -0800)]
am
a626f8d6: am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
a626f8d61bbcac2159a4f3c7b6e03c8dda482c78':
fix NPE in race condition.
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:55:56 +0000 (15:55 -0800)]
am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
2d559b5311be1cd909e5a445afe75a840688b822':
fix NPE in race condition.
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:55:44 +0000 (15:55 -0800)]
am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
2d559b5311be1cd909e5a445afe75a840688b822':
fix NPE in race condition.