OSDN Git Service
Mathias Agopian [Tue, 12 Jul 2011 21:51:45 +0000 (14:51 -0700)]
take the state transform into account with h/w composer hal
if the state transform didn't preserve rectangles, we
would still try to use h/w composer hal using the bounds
of the transformed rect, which isn't correct.
now we correctly fall back to composition.
Change-Id: Iff78f4339ece415d4987e95a5717b04934d370ab
Mathias Agopian [Tue, 12 Jul 2011 21:11:57 +0000 (14:11 -0700)]
Merge "fix typo in a comment"
Xavier Ducrohet [Tue, 12 Jul 2011 20:39:33 +0000 (13:39 -0700)]
Merge "LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager"
Jeff Brown [Tue, 12 Jul 2011 19:15:07 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Romain Guy [Tue, 12 Jul 2011 19:14:11 +0000 (12:14 -0700)]
Merge "Add test for bug #
4970944"
Xavier Ducrohet [Tue, 12 Jul 2011 19:03:23 +0000 (12:03 -0700)]
Merge "LayoutLib: Delegate for Display and IWindowManager implementation."
Chet Haase [Tue, 12 Jul 2011 18:58:58 +0000 (11:58 -0700)]
Merge "Fix Animator cancel() behavior"
Xavier Ducrohet [Tue, 12 Jul 2011 18:50:07 +0000 (11:50 -0700)]
Merge "new button graphics for layoutlib."
Dave Santoro [Tue, 12 Jul 2011 18:39:09 +0000 (11:39 -0700)]
Merge "Add data_set column for raw contacts and groups."
Adam Powell [Tue, 12 Jul 2011 18:36:43 +0000 (11:36 -0700)]
Merge "Fix bugs around restoring submenu state after activity teardown/restore"
Jeff Sharkey [Tue, 12 Jul 2011 18:09:09 +0000 (11:09 -0700)]
Merge "Return stats from inactive ifaces, packet counts."
Fabrice Di Meglio [Tue, 12 Jul 2011 16:39:18 +0000 (09:39 -0700)]
Merge "Fix scrolling bug causing centered cursor."
Ben Murdoch [Tue, 12 Jul 2011 15:51:23 +0000 (08:51 -0700)]
Merge changes I829b5d24,I521c0989
* changes:
Add missing auto-fill strings.
Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
Mark Brophy [Tue, 12 Jul 2011 09:57:16 +0000 (02:57 -0700)]
Merge "Expose app resume times to the ApplicationProvider."
satok [Tue, 12 Jul 2011 05:12:59 +0000 (22:12 -0700)]
Merge "Change IME picker dialog from Activity to Broadcast"
Jeff Brown [Tue, 12 Jul 2011 05:12:16 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
Mathias Agopian [Tue, 12 Jul 2011 01:30:41 +0000 (18:30 -0700)]
Merge "fix a weird use of Vector::appendVector()"
Mathias Agopian [Tue, 12 Jul 2011 01:30:29 +0000 (18:30 -0700)]
Merge "Fix typo in an assert's log"
Jamie Gennis [Tue, 12 Jul 2011 00:14:33 +0000 (17:14 -0700)]
Merge changes I002177a6,Ibaff52fe
* changes:
Add the EGL_ANDROID_recordable spec.
Add the spec for EGL_ANDROID_blob_cache.
Jamie Gennis [Sat, 9 Jul 2011 01:11:49 +0000 (18:11 -0700)]
Add the EGL_ANDROID_recordable spec.
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
Robert Greenwalt [Mon, 11 Jul 2011 23:47:25 +0000 (16:47 -0700)]
Merge "Fix wifi tethering."
Guang Zhu [Mon, 11 Jul 2011 23:45:35 +0000 (16:45 -0700)]
Merge "allow Uri as intent extra in am command"
Mathias Agopian [Mon, 11 Jul 2011 23:26:18 +0000 (16:26 -0700)]
Fix typo in an assert's log
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
Jeff Brown [Mon, 11 Jul 2011 23:00:11 +0000 (16:00 -0700)]
Merge "Increase activity timeouts when using a wrapper process."
Mike Lockwood [Mon, 11 Jul 2011 22:52:30 +0000 (15:52 -0700)]
Merge "UsbDeviceManager: Include kernel USB state in dumpsys output"
Mike Lockwood [Mon, 11 Jul 2011 22:52:06 +0000 (15:52 -0700)]
Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state"
Jason Sams [Mon, 11 Jul 2011 22:47:36 +0000 (15:47 -0700)]
Merge "Add error checks for AllocationAdapters being used in unsupported ways."
Jamie Gennis [Mon, 11 Jul 2011 22:47:20 +0000 (15:47 -0700)]
Merge "EGL: fix the ANativeWindow size/fmt override"
Romain Guy [Mon, 11 Jul 2011 22:37:24 +0000 (15:37 -0700)]
Merge "Always make GL calls with a valid EGL context. Bug #
5010760"
Romain Guy [Mon, 11 Jul 2011 22:33:51 +0000 (15:33 -0700)]
Always make GL calls with a valid EGL context.
Bug #
5010760
Change-Id: If7500ef69683948e727df1406f458f18b11259d1
Eric Laurent [Mon, 11 Jul 2011 22:20:27 +0000 (15:20 -0700)]
Merge "Audio Effect API: process reverse stream function"
Daniel Lehmann [Mon, 11 Jul 2011 22:10:04 +0000 (15:10 -0700)]
Merge "Remove restricted white-listing"
Jaikumar Ganesh [Mon, 11 Jul 2011 21:41:02 +0000 (14:41 -0700)]
Merge "Query the correct Extra for BT intents."
Shimeng (Simon) Wang [Mon, 11 Jul 2011 21:40:04 +0000 (14:40 -0700)]
Merge "Set mActualScale when initialScale is set."
Jaikumar Ganesh [Mon, 11 Jul 2011 21:17:57 +0000 (14:17 -0700)]
Merge "Bluetooth Health APIs"
Jeff Brown [Mon, 11 Jul 2011 20:41:26 +0000 (13:41 -0700)]
Merge "Remove more simulator support code. Bug:
5010576"
Adam Powell [Mon, 11 Jul 2011 20:39:45 +0000 (13:39 -0700)]
Merge "New assets from UX for dialogs/menu frames"
Jeff Brown [Mon, 11 Jul 2011 20:37:53 +0000 (13:37 -0700)]
Merge "Eliminate single-process mode. Bug:
5010576"
Jeff Brown [Mon, 11 Jul 2011 20:04:53 +0000 (13:04 -0700)]
Remove more simulator support code.
Bug:
5010576
Change-Id: Ie6c8665306bf4e822693b76f25c3a0f05c12d42d
James Dong [Mon, 11 Jul 2011 19:56:11 +0000 (12:56 -0700)]
Merge "Do not wait for unlaunched threads in stop()"
James Dong [Mon, 11 Jul 2011 19:46:35 +0000 (12:46 -0700)]
Merge "Release camera if CameraSource::start() has not been called"
Jamie Gennis [Fri, 1 Jul 2011 20:12:07 +0000 (13:12 -0700)]
EGL: fix the ANativeWindow size/fmt override
This change fixes how the Android EGL layer overrides the size and
format of an ANativeWindow in eglCreateWindowSurface. The new behavior
is to leave the size untouched when overriding the format. The previous
behavior was to reset the ANativeWindow to use the default size set by
the ANativeWindow implementation.
It also adds two new 'perform' methods to the ANativeWindow interface:
set_buffers_dimensions and set_buffers_format, and redefines the
behavior of set_buffers_geometry to be the combination of these two new
methods.
Additionally, this change adds an error check for the return value of
the new native_window_set_buffers_format call, which required adding a
(stub) handler for to FramebufferNativeWindow.
Change-Id: I805c7ccd8d4730dfb132d10d8bc3fb058a0b9df1
Mike Lockwood [Mon, 11 Jul 2011 19:15:21 +0000 (12:15 -0700)]
Merge "Remove unnecessary locking from MediaScanner JNI code"
Jamie Gennis [Fri, 8 Jul 2011 20:59:43 +0000 (13:59 -0700)]
Add the spec for EGL_ANDROID_blob_cache.
Change-Id: Ibaff52fee5c856283536ad37251cc80a9f3f938b
Elliott Hughes [Mon, 11 Jul 2011 18:24:54 +0000 (11:24 -0700)]
Merge "SDK_INT is not "current" on unreleased builds."
Andy McFadden [Mon, 11 Jul 2011 18:24:23 +0000 (11:24 -0700)]
Merge "Relocate common Calendar classes"
Fabrice Di Meglio [Mon, 11 Jul 2011 17:52:09 +0000 (10:52 -0700)]
Merge "Fix View reset of layoutDirection and textDirection"
Freeman Ng [Mon, 11 Jul 2011 17:46:12 +0000 (10:46 -0700)]
Merge "remove old style button bar look"
Mike Lockwood [Mon, 11 Jul 2011 17:41:52 +0000 (10:41 -0700)]
Merge "UsbDeviceManager: Fix indentation"
Mike Lockwood [Mon, 11 Jul 2011 17:41:08 +0000 (10:41 -0700)]
Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system"
Mike Lockwood [Mon, 11 Jul 2011 16:12:21 +0000 (09:12 -0700)]
Merge "MediaScanner: Use bulk inserts when in batch mode"
Jeff Sharkey [Sun, 10 Jul 2011 23:18:58 +0000 (16:18 -0700)]
Merge "Cached NTP time for system services."
Jim Miller [Sun, 10 Jul 2011 21:35:32 +0000 (14:35 -0700)]
Merge "Fix
4942542,
4590542: Password unlock fixes"
Jeff Brown [Sat, 9 Jul 2011 01:52:57 +0000 (18:52 -0700)]
Eliminate single-process mode.
Bug:
5010576
Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
Elliott Hughes [Sat, 9 Jul 2011 01:11:41 +0000 (18:11 -0700)]
Merge "Pass the targetSdkVersion through to the zygote-forked dalvik."
Robert Ly [Sat, 9 Jul 2011 00:53:12 +0000 (17:53 -0700)]
am
d9f91425: am
6b98e712: am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
d9f91425fc740bc85a8629a27b68b48acaf85962':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Joe Malin [Sat, 9 Jul 2011 00:53:09 +0000 (17:53 -0700)]
am
f84bb997: am
230ef987: am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
f84bb997717501e0af8672608c9d5bd89abe5334':
DOC CHANGE: Change GTV info on intro page
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"
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."
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"
Adam Powell [Fri, 8 Jul 2011 22:38:31 +0000 (15:38 -0700)]
Merge "The COLORS!!"
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"
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"
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
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
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"
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"
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."
Kristian Monsen [Fri, 8 Jul 2011 18:31:33 +0000 (11:31 -0700)]
Merge "Merge Chromium at r12.0.742.93: New autofill string"
Robert Greenwalt [Fri, 8 Jul 2011 18:06:55 +0000 (11:06 -0700)]
Merge "Remove unused setHttpProxy."
Robert Ly [Fri, 8 Jul 2011 17:44:10 +0000 (10:44 -0700)]
am
6b98e712: am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
6b98e7128b3fbfd8b2c421286c403e4609c69708':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Joe Malin [Fri, 8 Jul 2011 17:41:54 +0000 (10:41 -0700)]
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
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
Robert Ly [Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)]
am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Robert Ly [Fri, 8 Jul 2011 17:13:28 +0000 (10:13 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
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 Malin [Fri, 8 Jul 2011 16:39:25 +0000 (09:39 -0700)]
am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
0e89d916f078a518093c476725fa7e0798dcc590':
DOC CHANGE: Change GTV info on intro page
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
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:28:41 +0000 (21:28 -0700)]
Merge "Use NEAREST filtering mode for TextureView.getBitmap()."