54466 Commits

Author SHA1 Message Date
Wink Saville
0d171a66a4 Merge "resolved conflicts for merge of e4a56a32 to master" 2011-07-08 17:48:37 -07:00
Rajneesh Chowdury
bc2861fdbb Merge "Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn" 2011-07-08 17:00:08 -07:00
Elliott Hughes
e1dfcb7ab0 Pass the targetSdkVersion through to the zygote-forked dalvik.
This will let dalvik implement backwards-compatibile behaviors based on
an app's targetSdkVersion.

Bug: 4772166
Change-Id: I935c5ea9144e8b4e6e21089547287486e2234b7f
2011-07-08 16:54:16 -07:00
Romain Guy
3b240117d1 Merge "Align paths on pixel boundaries when rasterizing in bitmaps. Bug #5003739" 2011-07-08 16:53:23 -07:00
Romain Guy
40c4b86b72 Align paths on pixel boundaries when rasterizing in bitmaps.
Bug #5003739

Change-Id: I3dfbf4eb92e2c870f33c96947a7d6439e3730965
2011-07-08 16:50:15 -07:00
Shimeng (Simon) Wang
e5f5e82027 Merge "Prevent set mInitialScale being overridden by mDefaultScale." 2011-07-08 16:48:23 -07:00
Romain Guy
fcc8fae91e Merge "Correctly render nested rectangles with different winding rules." 2011-07-08 16:27:47 -07:00
Romain Guy
d4b5795e5e Correctly render nested rectangles with different winding rules.
Change-Id: I331d9dc1c17aee62a2fa213692c62a5ba1bb079a
2011-07-08 16:27:02 -07:00
Andy McFadden
64a3b34afa Relocate common Calendar classes
Move some classes from android.pim to com.android.calendarcommon.

Bug 4575374

Change-Id: Iab09cb331a0a74f6b951ab5e5b7c207e8f1b939c
2011-07-08 16:20:13 -07:00
Gilles Debunne
db13e87983 Merge "Fleshed up SuggestionSpan documentation. Bug 4553472" 2011-07-08 16:02:36 -07:00
Romain Guy
c7a8be7fc4 Merge "Always redraw the UI on orientation change Bug #4994715" 2011-07-08 15:54:10 -07:00
Romain Guy
7e1160e866 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
2011-07-08 15:49:50 -07:00
Adam Powell
94a397bcf2 Merge "The COLORS!!" 2011-07-08 15:38:31 -07:00
Adam Powell
36f469fa46 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
2011-07-08 15:36:33 -07:00
Mathias Agopian
2bc1427e90 Merge "fix screen on/off animation (again)" 2011-07-08 15:34:50 -07:00
Mathias Agopian
9ed8c77b7b Merge "Add a simple EGL test" 2011-07-08 15:34:33 -07:00
Mathias Agopian
a7b9556dca Merge "Fix EGLUtils::selectConfigForPixelFormat()" 2011-07-08 15:34:23 -07:00
RoboErik
bb594dcdb4 Merge "Unhide CalendarContract apis" 2011-07-08 15:28:26 -07:00
Gilles Debunne
4dacef2566 Fleshed up SuggestionSpan documentation. Bug 4553472
Change-Id: I3b5be9a6da79398b03d98eb33eb61a55fd702960
2011-07-08 15:24:29 -07:00
RoboErik
3672696dc5 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
2011-07-08 15:18:17 -07:00
Jaikumar Ganesh
7b588b04f5 Merge "Get server's listening channel" 2011-07-08 15:01:18 -07:00
Gilles Debunne
dbd3fe77a1 Merge "Animation settings reset to default" 2011-07-08 14:56:14 -07:00
Rajneesh Chowdury
559bb7951f Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn
Change-Id: Ic8b4360cdabb157fa7739552b73e3c3daab88129
2011-07-08 14:56:06 -07:00
Mathias Agopian
222b466d5a Add a simple EGL test
currently it just tests EGLConfig selection

Change-Id: Id9d9971012d733147dd7dc02fa2054307960235e
2011-07-08 14:40:39 -07:00
Shimeng (Simon) Wang
1151fe78fc 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
2011-07-08 14:38:38 -07:00
Mathias Agopian
3a831d24e9 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
2011-07-08 14:37:06 -07:00
Mathias Agopian
1861786a97 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
2011-07-08 14:37:05 -07:00
Ben Dodson
6d8b80dd8c Get server's listening channel
Change-Id: Ia1cb3486a4ba502185efdcf6d7bcf0f37bb55261
2011-07-08 14:36:42 -07:00
James Dong
0aaa30dc48 Merge "Use advertised h264 encoding parameters by default if the profile is not baseline" 2011-07-08 14:17:16 -07:00
Glenn Kasten
916a63a53e Merge "Fix build warning; LOG_TAG was misplaced" 2011-07-08 14:06:24 -07:00
RoboErik
b3a86c86e7 Merge "Pseudo-final api fixes to CalendarContract" 2011-07-08 14:05:42 -07:00
Jason Sams
48fe534838 Add error checks for AllocationAdapters being used in unsupported ways.
Change-Id: If6506e04d65a7b3d79203ac7a20a7961368ef04f
2011-07-08 13:52:30 -07:00
RoboErik
58644028f9 Pseudo-final api fixes to CalendarContract
This removes the public projections and makes them arguments
that are passed in instead.

Change-Id: Ic9807d4994a9f2798b0ecf9a63194193715931e0
2011-07-08 13:48:53 -07:00
Jim Miller
edbff0df92 Merge "Fix 4689527: Improved curation for Recents + misc cleanup" 2011-07-08 13:14:38 -07:00
Wink Saville
ae367419df resolved conflicts for merge of e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
2011-07-08 12:49:14 -07:00
Christopher Tate
f24ee7f1f5 Merge "Can now restore a subset of apps from historical dataset" 2011-07-08 12:48:48 -07:00
John Reck
effa7523f4 Merge "NPE guard in setupViewport" 2011-07-08 12:43:22 -07:00
Christopher Tate
284f1bb4da 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
2011-07-08 12:28:48 -07:00
Wink Saville
d5cabff96a 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.
2011-07-08 12:28:27 -07:00
Romain Guy
44476779ae Merge "Correctly position layers." 2011-07-08 11:58:18 -07:00
Romain Guy
b2479153b7 Correctly position layers.
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a
2011-07-08 11:57:29 -07:00
Kristian Monsen
7cec24f747 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
John Reck
d4324aa101 NPE guard in setupViewport
Bug: 4163660

Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
2011-07-08 11:23:39 -07:00
Gilles Debunne
fa53d3002f Animation settings reset to default
Change-Id: Ie53c031ceb88d356742e80693edc14198506d54a
2011-07-08 11:21:09 -07:00
Robert Greenwalt
532fee45e2 Merge "Remove unused setHttpProxy." 2011-07-08 11:06:55 -07:00
Robert Ly
d9f91425fc am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '6b98e7128b3fbfd8b2c421286c403e4609c69708':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
2011-07-08 10:44:10 -07:00
James Dong
be650872f8 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
2011-07-08 10:44:05 -07:00
Joe Malin
f84bb99771 am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '230ef98728f3b59a81f55dab5129aa50d5f27969':
  DOC CHANGE: Change GTV info on intro page
2011-07-08 10:41:54 -07:00
Joe Fernandez
d1c15f96dd am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '20f6520197a6b70123d2ff7c466ee58349ae3032':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
2011-07-08 10:41:35 -07:00
Robert Ly
6b98e7128b am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
2011-07-08 10:39:46 -07:00