Commit Graph

36510 Commits

Author SHA1 Message Date
James Dong
e9d6c0361f Merge "Do not wait for unlaunched threads in stop()" 2011-07-11 12:56:11 -07:00
James Dong
1a7e20cade Merge "Release camera if CameraSource::start() has not been called" 2011-07-11 12:46:35 -07:00
Mike Lockwood
7e1acdffb2 Merge "Remove unnecessary locking from MediaScanner JNI code" 2011-07-11 12:15:21 -07:00
Elliott Hughes
6a90b3a3d7 Merge "SDK_INT is not "current" on unreleased builds." 2011-07-11 11:24:54 -07:00
Andy McFadden
14e6a68655 Merge "Relocate common Calendar classes" 2011-07-11 11:24:23 -07:00
Fabrice Di Meglio
582b52b064 Merge "Fix View reset of layoutDirection and textDirection" 2011-07-11 10:52:09 -07:00
Freeman Ng
0d36bde51c Merge "remove old style button bar look" 2011-07-11 10:46:12 -07:00
Mike Lockwood
606eaf69b5 Merge "UsbDeviceManager: Fix indentation" 2011-07-11 10:41:52 -07:00
Mike Lockwood
f88a0d578f Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system" 2011-07-11 10:41:08 -07:00
Mike Lockwood
3494e8a720 Merge "MediaScanner: Use bulk inserts when in batch mode" 2011-07-11 09:12:21 -07:00
Jeff Sharkey
a22433e4a8 Merge "Cached NTP time for system services." 2011-07-10 16:18:58 -07:00
Jim Miller
c682c3d0ad Merge "Fix 4942542, 4590542: Password unlock fixes" 2011-07-10 14:35:32 -07:00
Elliott Hughes
67ef7c507f Merge "Pass the targetSdkVersion through to the zygote-forked dalvik." 2011-07-08 18:11:41 -07:00
Robert Ly
060f475750 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
2011-07-08 17:53:12 -07:00
Joe Malin
1a1c28dc8b 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
2011-07-08 17:53:09 -07:00
Joe Fernandez
dce1356155 am d1c15f96: am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit 'd1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
2011-07-08 17:53:06 -07:00
Wink Saville
d60083b00a am 3ef341cd: am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
* commit '3ef341cda51d5bc35b0bc919f7514653ec194410':
  Disconnect ApnContexts in INITING state when error.
2011-07-08 17:52:56 -07:00
Wink Saville
006c3d4ad7 Merge "resolved conflicts for merge of e4a56a32 to master" 2011-07-08 17:48:37 -07:00
Rajneesh Chowdury
b6c544f606 Merge "Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn" 2011-07-08 17:00:08 -07:00
Romain Guy
c16b883579 Merge "Align paths on pixel boundaries when rasterizing in bitmaps. Bug #5003739" 2011-07-08 16:53:23 -07:00
Shimeng (Simon) Wang
8570e2fe08 Merge "Prevent set mInitialScale being overridden by mDefaultScale." 2011-07-08 16:48:23 -07:00
Romain Guy
19c61f4cb8 Merge "Correctly render nested rectangles with different winding rules." 2011-07-08 16:27:47 -07:00
Gilles Debunne
675dad843d Merge "Fleshed up SuggestionSpan documentation. Bug 4553472" 2011-07-08 16:02:36 -07:00
Romain Guy
6e25e45259 Merge "Always redraw the UI on orientation change Bug #4994715" 2011-07-08 15:54:10 -07:00
Adam Powell
77ac3f7658 Merge "The COLORS!!" 2011-07-08 15:38:31 -07:00
Mathias Agopian
5561f1a070 Merge "fix screen on/off animation (again)" 2011-07-08 15:34:50 -07:00
Mathias Agopian
f915de4b2f Merge "Add a simple EGL test" 2011-07-08 15:34:33 -07:00
Mathias Agopian
1382cbb4b9 Merge "Fix EGLUtils::selectConfigForPixelFormat()" 2011-07-08 15:34:23 -07:00
RoboErik
5e5e8c3e0d Merge "Unhide CalendarContract apis" 2011-07-08 15:28:26 -07:00
Jaikumar Ganesh
60a918a356 Merge "Get server's listening channel" 2011-07-08 15:01:18 -07:00
Gilles Debunne
1fb0d1964a Merge "Animation settings reset to default" 2011-07-08 14:56:14 -07:00
Mathias Agopian
2f739f8f04 Add a simple EGL test
currently it just tests EGLConfig selection

Change-Id: Id9d9971012d733147dd7dc02fa2054307960235e
2011-07-08 14:40:39 -07:00
Mathias Agopian
ffcf465771 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
6163091a2c 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
James Dong
a464123a0d Merge "Use advertised h264 encoding parameters by default if the profile is not baseline" 2011-07-08 14:17:16 -07:00
Glenn Kasten
54160d28db Merge "Fix build warning; LOG_TAG was misplaced" 2011-07-08 14:06:24 -07:00
RoboErik
adc0f725a6 Merge "Pseudo-final api fixes to CalendarContract" 2011-07-08 14:05:42 -07:00
Jim Miller
f2b0cc64be Merge "Fix 4689527: Improved curation for Recents + misc cleanup" 2011-07-08 13:14:38 -07:00
Wink Saville
cce72dd51f resolved conflicts for merge of e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
2011-07-08 12:49:14 -07:00
Christopher Tate
32a84e24d6 Merge "Can now restore a subset of apps from historical dataset" 2011-07-08 12:48:48 -07:00
John Reck
cbb24abc0f Merge "NPE guard in setupViewport" 2011-07-08 12:43:22 -07:00
Wink Saville
656b373568 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
1c8b5beb00 Merge "Correctly position layers." 2011-07-08 11:58:18 -07:00
Kristian Monsen
b7beee0192 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
Robert Greenwalt
ab1db31b71 Merge "Remove unused setHttpProxy." 2011-07-08 11:06:55 -07:00
Robert Ly
5e40a8e9f4 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
Joe Malin
83d7414c9e 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
1a1c333424 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
b30faa2e11 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
Robert Ly
9186b53da7 Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 2011-07-08 10:13:28 -07:00