OSDN Git Service
Joe Fernandez [Sat, 9 Jul 2011 00:53:06 +0000 (17:53 -0700)]
am
d1c15f96: am
20f65201: am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
d1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Wink Saville [Sat, 9 Jul 2011 00:52:56 +0000 (17:52 -0700)]
am
3ef341cd: am
7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '
3ef341cda51d5bc35b0bc919f7514653ec194410':
Disconnect ApnContexts in INITING state when error.
Wink Saville [Sat, 9 Jul 2011 00:48:37 +0000 (17:48 -0700)]
Merge "resolved conflicts for merge of
e4a56a32 to master"
Rajneesh Chowdury [Sat, 9 Jul 2011 00:00:08 +0000 (17:00 -0700)]
Merge "Fix for issue
5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn"
Romain Guy [Fri, 8 Jul 2011 23:53:23 +0000 (16:53 -0700)]
Merge "Align paths on pixel boundaries when rasterizing in bitmaps. Bug #
5003739"
Romain Guy [Fri, 8 Jul 2011 23:50:15 +0000 (16:50 -0700)]
Align paths on pixel boundaries when rasterizing in bitmaps.
Bug #
5003739
Change-Id: I3dfbf4eb92e2c870f33c96947a7d6439e3730965
Shimeng (Simon) Wang [Fri, 8 Jul 2011 23:48:23 +0000 (16:48 -0700)]
Merge "Prevent set mInitialScale being overridden by mDefaultScale."
Romain Guy [Fri, 8 Jul 2011 23:27:47 +0000 (16:27 -0700)]
Merge "Correctly render nested rectangles with different winding rules."
Romain Guy [Fri, 8 Jul 2011 23:27:02 +0000 (16:27 -0700)]
Correctly render nested rectangles with different winding rules.
Change-Id: I331d9dc1c17aee62a2fa213692c62a5ba1bb079a
Gilles Debunne [Fri, 8 Jul 2011 23:02:36 +0000 (16:02 -0700)]
Merge "Fleshed up SuggestionSpan documentation. Bug
4553472"
Romain Guy [Fri, 8 Jul 2011 22:54:10 +0000 (15:54 -0700)]
Merge "Always redraw the UI on orientation change Bug #
4994715"
Romain Guy [Fri, 8 Jul 2011 22:49:50 +0000 (15:49 -0700)]
Always redraw the UI on orientation change
Bug #
4994715
In some cases, on some architectures, the hardware renderer could fail
to properly render a window after an orientation change. The fix is
to force the GL driver to drop any existing buffer to make sure the
next buffer used to draw has the correct geometry.
This change also fixes an issue that was preventing partial screen
updates from being properly enabled.
Change-Id: I874a48590845a8624425130af7db8e20022895dd
Adam Powell [Fri, 8 Jul 2011 22:38:31 +0000 (15:38 -0700)]
Merge "The COLORS!!"
Adam Powell [Fri, 8 Jul 2011 22:28:29 +0000 (15:28 -0700)]
The COLORS!!
Add theme attributes and public color resources. Apps can now query
the current theme's various highlight colors. Commonly used color
values for Holo are now available.
Change-Id: If24dc9ee243e740e8caaddf0b78590783fa228c8
Mathias Agopian [Fri, 8 Jul 2011 22:34:50 +0000 (15:34 -0700)]
Merge "fix screen on/off animation (again)"
Mathias Agopian [Fri, 8 Jul 2011 22:34:33 +0000 (15:34 -0700)]
Merge "Add a simple EGL test"
Mathias Agopian [Fri, 8 Jul 2011 22:34:23 +0000 (15:34 -0700)]
Merge "Fix EGLUtils::selectConfigForPixelFormat()"
RoboErik [Fri, 8 Jul 2011 22:28:26 +0000 (15:28 -0700)]
Merge "Unhide CalendarContract apis"
Gilles Debunne [Fri, 8 Jul 2011 18:45:39 +0000 (11:45 -0700)]
Fleshed up SuggestionSpan documentation. Bug
4553472
Change-Id: I3b5be9a6da79398b03d98eb33eb61a55fd702960
RoboErik [Tue, 14 Jun 2011 21:01:15 +0000 (14:01 -0700)]
Unhide CalendarContract apis
This exposes the set of apis necessary to unbundle the Calendar
app and sync adapters as well as allowing third party developers
to officially access the calendar provider. This is the current
final set of apis to expose, though changes may occur if we
discover new issues. The documentation and CTS tests are still
in progress.
Change-Id: If77f9a1d49a26725b44b1014e8d088be7ffbc707
Jaikumar Ganesh [Fri, 8 Jul 2011 22:01:18 +0000 (15:01 -0700)]
Merge "Get server's listening channel"
Gilles Debunne [Fri, 8 Jul 2011 21:56:14 +0000 (14:56 -0700)]
Merge "Animation settings reset to default"
Rajneesh Chowdury [Fri, 8 Jul 2011 21:56:06 +0000 (14:56 -0700)]
Fix for issue
5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn
Change-Id: Ic8b4360cdabb157fa7739552b73e3c3daab88129
Mathias Agopian [Thu, 7 Jul 2011 21:54:30 +0000 (14:54 -0700)]
Add a simple EGL test
currently it just tests EGLConfig selection
Change-Id: Id9d9971012d733147dd7dc02fa2054307960235e
Shimeng (Simon) Wang [Fri, 8 Jul 2011 21:33:11 +0000 (14:33 -0700)]
Prevent set mInitialScale being overridden by mDefaultScale.
If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.
issue:
4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
Mathias Agopian [Fri, 8 Jul 2011 00:30:31 +0000 (17:30 -0700)]
fix screen on/off animation (again)
- surfaceflinger now uses the GL-convention of
placing the origin in the left-bottom corner
- map texture coordinates of the screen capture
properly
- add the ability to control the animation
speed through a debug property
Bug:
4989276
Change-Id: Ifb3297bb578078b47146fff666c01f85417e0d6f
Mathias Agopian [Wed, 6 Jul 2011 23:35:30 +0000 (16:35 -0700)]
Fix EGLUtils::selectConfigForPixelFormat()
- renderscript now calls EGL directly instead of relying on this function
- surfaceflinger also does its own EGLConfig selection
- selectConfigForPixelFormat stays for legacy reason (many tests use it) but
it now only tries to match the alpha channel of the format rather than the
format itself.
this will allow implementations who don't support the exact formats
defined in the HAL to work properly.
Bug:
4998223
Change-Id: Ic664dfc14d5072a514b6f77a115d1521bfc1578f
Ben Dodson [Fri, 8 Jul 2011 21:36:42 +0000 (14:36 -0700)]
Get server's listening channel
Change-Id: Ia1cb3486a4ba502185efdcf6d7bcf0f37bb55261
James Dong [Fri, 8 Jul 2011 21:17:16 +0000 (14:17 -0700)]
Merge "Use advertised h264 encoding parameters by default if the profile is not baseline"
Glenn Kasten [Fri, 8 Jul 2011 21:06:24 +0000 (14:06 -0700)]
Merge "Fix build warning; LOG_TAG was misplaced"
RoboErik [Fri, 8 Jul 2011 21:05:42 +0000 (14:05 -0700)]
Merge "Pseudo-final api fixes to CalendarContract"
RoboErik [Fri, 8 Jul 2011 20:39:05 +0000 (13:39 -0700)]
Pseudo-final api fixes to CalendarContract
This removes the public projections and makes them arguments
that are passed in instead.
Change-Id: Ic9807d4994a9f2798b0ecf9a63194193715931e0
Jim Miller [Fri, 8 Jul 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Fix
4689527: Improved curation for Recents + misc cleanup"
Wink Saville [Fri, 8 Jul 2011 19:49:14 +0000 (12:49 -0700)]
resolved conflicts for merge of
e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
Christopher Tate [Fri, 8 Jul 2011 19:48:48 +0000 (12:48 -0700)]
Merge "Can now restore a subset of apps from historical dataset"
John Reck [Fri, 8 Jul 2011 19:43:22 +0000 (12:43 -0700)]
Merge "NPE guard in setupViewport"
Christopher Tate [Thu, 7 Jul 2011 21:31:18 +0000 (14:31 -0700)]
Can now restore a subset of apps from historical dataset
Adds the ability to filter a restore of an historical dataset so that it
only restores certain apps' data regardless of what is actually present
in the dataset. This is currently only used by the bmgr command-line tool,
for debugging / developer support.
Bug
2021590
Change-Id: I7685e5d609b0f5506f71d70c26410602bb387659
Wink Saville [Fri, 8 Jul 2011 19:28:27 +0000 (12:28 -0700)]
am
a736cd54: am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Romain Guy [Fri, 8 Jul 2011 18:58:18 +0000 (11:58 -0700)]
Merge "Correctly position layers."
Romain Guy [Fri, 8 Jul 2011 18:57:29 +0000 (11:57 -0700)]
Correctly position layers.
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a
Kristian Monsen [Fri, 8 Jul 2011 18:31:33 +0000 (11:31 -0700)]
Merge "Merge Chromium at r12.0.742.93: New autofill string"
John Reck [Fri, 8 Jul 2011 18:22:38 +0000 (11:22 -0700)]
NPE guard in setupViewport
Bug:
4163660
Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
Gilles Debunne [Fri, 8 Jul 2011 17:40:51 +0000 (10:40 -0700)]
Animation settings reset to default
Change-Id: Ie53c031ceb88d356742e80693edc14198506d54a
Robert Greenwalt [Fri, 8 Jul 2011 18:06:55 +0000 (11:06 -0700)]
Merge "Remove unused setHttpProxy."
James Dong [Thu, 7 Jul 2011 23:41:25 +0000 (16:41 -0700)]
Use advertised h264 encoding parameters by default if the profile is not baseline
o Force to use AVC baseline profile for camcorder low quality videos
Change-Id: I3424c57dd0c55fc4991f5767b57695c8f3420ecb
Joe Fernandez [Fri, 8 Jul 2011 17:41:35 +0000 (10:41 -0700)]
am
20f65201: am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
20f6520197a6b70123d2ff7c466ee58349ae3032':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Narayan Kamath [Fri, 8 Jul 2011 11:13:03 +0000 (12:13 +0100)]
Add event-log logging for TTS requests.
Change-Id: I5023194c469a602b85259088a2e59373c96a941e
Wink Saville [Fri, 8 Jul 2011 16:40:11 +0000 (09:40 -0700)]
am
7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '
7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
Disconnect ApnContexts in INITING state when error.
Wink Saville [Fri, 8 Jul 2011 16:40:08 +0000 (09:40 -0700)]
am
8171e6f6: Use resetConnections with resetMask.
* commit '
8171e6f690cca1bad354e7e352823d79d420daf3':
Use resetConnections with resetMask.
Wink Saville [Fri, 8 Jul 2011 16:40:03 +0000 (09:40 -0700)]
am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
848aa3ab8a00835c5af2ead954c7736e507249b5':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Joe Fernandez [Fri, 8 Jul 2011 16:39:22 +0000 (09:39 -0700)]
am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Glenn Kasten [Fri, 8 Jul 2011 16:32:50 +0000 (09:32 -0700)]
Fix build warning; LOG_TAG was misplaced
Change-Id: I4fb0590f626445188f9053367707878b2fa0fa30
Kristian Monsen [Fri, 8 Jul 2011 15:45:10 +0000 (16:45 +0100)]
Merge Chromium at r12.0.742.93: New autofill string
Added a string that we now use.
Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
Jim Miller [Fri, 8 Jul 2011 03:53:52 +0000 (20:53 -0700)]
Fix
4689527: Improved curation for Recents + misc cleanup
This sets a threshhold for both the curation animation as well as the
snap back animation. It now limits these to 500ms and 250ms, respectively.
Cleaned up misc log spew.
Updated after review.
Change-Id: Ie11a2fc4556b396257c33c3ebd7513c4c220ff95
Wink Saville [Fri, 8 Jul 2011 05:00:56 +0000 (22:00 -0700)]
Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
Romain Guy [Fri, 8 Jul 2011 04:35:19 +0000 (21:35 -0700)]
Merge "Cleanup"
Romain Guy [Fri, 8 Jul 2011 04:33:41 +0000 (21:33 -0700)]
Cleanup
Change-Id: I2a9dc34e907b4c6e60f8c2999150b22015012e74
Romain Guy [Fri, 8 Jul 2011 04:28:41 +0000 (21:28 -0700)]
Merge "Use NEAREST filtering mode for TextureView.getBitmap()."
Romain Guy [Fri, 8 Jul 2011 04:05:04 +0000 (21:05 -0700)]
Use NEAREST filtering mode for TextureView.getBitmap().
Change-Id: I4649062bbdf18ebba7924bdf578f39ad8f6576ac
Adam Powell [Fri, 8 Jul 2011 03:55:10 +0000 (20:55 -0700)]
Merge "Add ALL CAPS style to TextView/TextAppearance"
Romain Guy [Fri, 8 Jul 2011 03:55:08 +0000 (20:55 -0700)]
Merge "Use NEAREST filtering for layers whenever possible."
Romain Guy [Fri, 8 Jul 2011 03:50:11 +0000 (20:50 -0700)]
Use NEAREST filtering for layers whenever possible.
Change-Id: Id5bee1bd4a322cf93e8000b08e18f1e1b058648e
Adam Powell [Fri, 8 Jul 2011 01:35:54 +0000 (18:35 -0700)]
Add ALL CAPS style to TextView/TextAppearance
Switch out ugly hack in action menu items for the new style.
Change-Id: I68a0ed62a352b14d499e6478b82bbc12dcb5a030
Ramesh Sudini [Wed, 29 Jun 2011 16:43:27 +0000 (11:43 -0500)]
Disconnect ApnContexts in INITING state when error.
When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.
Bug:
4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
Michael Jurka [Thu, 7 Jul 2011 23:28:03 +0000 (16:28 -0700)]
Merge "Handling Resources.NotFoundException in Recents"
Jason Sams [Thu, 7 Jul 2011 23:24:51 +0000 (16:24 -0700)]
Merge "Fix more type info caching bugs."
Jason Sams [Thu, 7 Jul 2011 23:17:36 +0000 (16:17 -0700)]
Fix more type info caching bugs.
Change-Id: I917a1190ec12fe954c9bf51ffd446ef564837e68
Shimeng (Simon) Wang [Thu, 7 Jul 2011 23:17:16 +0000 (16:17 -0700)]
Merge "Update viewport asap."
Wink Saville [Thu, 7 Jul 2011 23:17:06 +0000 (16:17 -0700)]
Use resetConnections with resetMask.
Bug:
4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
Jason Sams [Thu, 7 Jul 2011 23:10:38 +0000 (16:10 -0700)]
Merge "Fix defered type creation when loading from A3D."
Gilles Debunne [Thu, 7 Jul 2011 23:07:07 +0000 (16:07 -0700)]
Merge "XmlDocumentProvider moved to the XmlAdapter sample code"
Jason Sams [Thu, 7 Jul 2011 23:05:18 +0000 (16:05 -0700)]
Fix defered type creation when loading from A3D.
Change-Id: I09387c0859dcc9fe77014bc7486109d81742f298
Jason Sams [Thu, 7 Jul 2011 22:50:41 +0000 (15:50 -0700)]
Merge "AllocationAdapter cleanup."
Michael Jurka [Thu, 7 Jul 2011 22:42:30 +0000 (15:42 -0700)]
Handling Resources.NotFoundException in Recents
Eric Laurent [Thu, 7 Jul 2011 22:37:07 +0000 (15:37 -0700)]
Merge "Moved and renamed effect API header files"
Joe Fernandez [Thu, 7 Jul 2011 22:33:15 +0000 (15:33 -0700)]
Merge "Revert "docs: OpenGL Tutorials""
Shimeng (Simon) Wang [Thu, 7 Jul 2011 22:26:22 +0000 (15:26 -0700)]
Update viewport asap.
Update viewport as soon as possible to make sure layout has correct viewport.
This helps fixes gmail flickering issue.
Also helps the case a mobile site is switched to desktop when the
user agent is switched.
issue:
4723800
Change-Id: I3dc9e52d912d49478d562cec3f38d653a563715e
Eric Laurent [Fri, 24 Jun 2011 14:01:31 +0000 (07:01 -0700)]
Moved and renamed effect API header files
Moved specific effect header files to
system/media/audio_effects/include/audio_effects
and renamed to lower case (effect_xxx.h).
Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
Jason Sams [Thu, 7 Jul 2011 22:24:42 +0000 (15:24 -0700)]
AllocationAdapter cleanup.
Change-Id: Ia7eb0925e410779bbd6a925af721e3834dcf83f8
Joe Fernandez [Thu, 7 Jul 2011 22:22:09 +0000 (15:22 -0700)]
Revert "docs: OpenGL Tutorials"
This reverts commit
4cd8360943a167505c929a309cccd7cb56eb4138
Huahui Wu [Thu, 7 Jul 2011 22:10:25 +0000 (15:10 -0700)]
Merge "Revert "b/
3302378 Passes touch pressures, size and timestamps to webkit.""
Joe Fernandez [Thu, 7 Jul 2011 22:03:55 +0000 (15:03 -0700)]
Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
Huahui Wu [Thu, 7 Jul 2011 21:27:44 +0000 (14:27 -0700)]
Revert "b/
3302378 Passes touch pressures, size and timestamps to webkit."
This reverts commit
6e64e0c61720244894dbd1fd6b36394adc63b2de.
It introduced a null pointer crash for pinch-and-zoom.
Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968
Jamie Gennis [Thu, 7 Jul 2011 21:42:12 +0000 (14:42 -0700)]
Merge "SurfaceTexture: enable newly passing tests."
Wink Saville [Thu, 7 Jul 2011 21:39:23 +0000 (14:39 -0700)]
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
Adam Powell [Thu, 7 Jul 2011 21:35:22 +0000 (14:35 -0700)]
Merge "Action bar layout tweaks"
Jim Miller [Thu, 7 Jul 2011 21:35:18 +0000 (14:35 -0700)]
Merge "Fix
4689527: Fix rendering issue with thumbnails on phones"
Joe Fernandez [Thu, 7 Jul 2011 21:31:02 +0000 (14:31 -0700)]
Merge "docs: OpenGL Tutorials"
Philip Milne [Thu, 7 Jul 2011 21:30:31 +0000 (14:30 -0700)]
Merge "Simplify and tidy the API for maximum value support."
Jim Miller [Thu, 7 Jul 2011 02:57:05 +0000 (19:57 -0700)]
Fix
4689527: Fix rendering issue with thumbnails on phones
This fixes a bug where the phone thumbnail scale was being miscalculated
for the square aspect of thumbnails on phones. The code now constrains
thumbnails to fit the smaller of screen width and screen height.
Change-Id: I174abacd4cf3dcf124e10fe8980fb01fe299ec6a
Philip Milne [Thu, 7 Jul 2011 18:47:08 +0000 (11:47 -0700)]
Simplify and tidy the API for maximum value support.
Also:
. Remove CAN_SHRINK, FIXED from public view. These can be added later.
Change-Id: I63a64ac4748605da60373c8e3c2109178b5260c2
Wink Saville [Thu, 7 Jul 2011 21:16:30 +0000 (14:16 -0700)]
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Update comment that values should be changed after releasing.
Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
Adam Powell [Thu, 7 Jul 2011 17:22:27 +0000 (10:22 -0700)]
Action bar layout tweaks
Fix a Spinner issue that reported odd baselines
Fix detection of expandable items for action menus and allocation of cells
Use the right asset for home-as-up in Theme.Holo.Light.SolidActionBar.Inverse
Add TextAppearance.Holo.Widget.ActionBar.Menu as a basis for further
menu item styling
Sync with design for tab/menu text appearance
Change-Id: I32026bbde1cd4e15b6cda30d78d3d48250c84c94
Romain Guy [Thu, 7 Jul 2011 21:10:52 +0000 (14:10 -0700)]
Merge "Add an API to query maximum bitmap/texture size on Canvas."
Romain Guy [Thu, 7 Jul 2011 21:10:06 +0000 (14:10 -0700)]
Add an API to query maximum bitmap/texture size on Canvas.
Change-Id: I2c576c9a4ecad9f33cc6636bcbc29786acdf052d
Jim Miller [Thu, 7 Jul 2011 20:58:13 +0000 (13:58 -0700)]
Merge "Fix
4689527: Update Recents"
Daniel Lehmann [Thu, 7 Jul 2011 20:34:59 +0000 (13:34 -0700)]
Merge "Contacts contract changes for social updates."
James Dong [Thu, 7 Jul 2011 20:34:58 +0000 (13:34 -0700)]
Merge "Add support for some custom YUV420 color formats to recordvideo utility"
Matthew Xie [Sun, 26 Jun 2011 04:47:07 +0000 (21:47 -0700)]
Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.
Includes down merged contributions from Jaikumar Ganesh.
Change-Id: Ic8b857aad3554315aae39a0e871eb94d0ac98a91
Eric Fischer [Thu, 7 Jul 2011 18:33:38 +0000 (11:33 -0700)]
Merge "Import revised translations."