Daniel Sandler
a5960ca37f
am 2f6a5327: Merge "Auto-close if you swipe away the last notification." into ics-mr0
...
* commit '2f6a53270f113a244f3b6ca91a1efef2c4a26fac':
Auto-close if you swipe away the last notification.
2011-10-19 12:00:13 -07:00
Daniel Sandler
dee884f13a
Merge "Auto-close if you swipe away the last notification." into ics-mr0
2011-10-19 11:58:27 -07:00
Dianne Hackborn
b3077a6029
am 47f8367a: Merge "Work on issue #5465917 : Wakelock *overflow* held for very long times" into ics-mr0
...
* commit '47f8367ab79247501d5d204632a7797fa8a888e5':
Work on issue #5465917 : Wakelock *overflow* held for very long times
2011-10-19 11:10:18 -07:00
Jamie Gennis
baf0e06dea
am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
...
* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
SurfaceTexture: free buffers when disconnect fails
2011-10-19 11:08:11 -07:00
Dianne Hackborn
f7db9d8b52
Merge "Work on issue #5465917 : Wakelock *overflow* held for very long times" into ics-mr0
2011-10-19 11:07:34 -07:00
Jamie Gennis
c9362e7b0f
Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
2011-10-19 11:06:05 -07:00
Michael Jurka
860573e62c
am 9a76afff: Merge "Make Recent Apps faster" into ics-mr0
...
* commit '9a76afff4da4bd51685b0938439c4f4a0e19345f':
Make Recent Apps faster
2011-10-19 10:31:47 -07:00
Ben Komalo
65da87a8bd
am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0
...
* commit '8408e5165a74ddee7d2d8698314cfda521fbfc76':
Fix remote device wipe to not hang.
2011-10-19 10:31:42 -07:00
Michael Jurka
1248d07eb9
Merge "Make Recent Apps faster" into ics-mr0
2011-10-19 10:04:19 -07:00
Ben Komalo
d5dd8263e6
Merge "Fix remote device wipe to not hang." into ics-mr0
2011-10-19 09:32:50 -07:00
Marco Nelissen
50fc325854
Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."
2011-10-19 07:50:24 -07:00
The Android Open Source Project
357ae311a5
Reconcile with ics-mr0-release
...
Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b
2011-10-19 07:23:01 -07:00
The Android Automerger
0e66387805
merge in ics-mr0-release history after reset to ics-mr0
2011-10-19 06:28:30 -07:00
Dave Burke
818fb24357
am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
...
* commit '70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
Add a LayerScreenshot
2011-10-18 23:00:08 -07:00
Dave Burke
8b29b65aeb
Merge "Add a LayerScreenshot" into ics-mr0
2011-10-18 22:58:09 -07:00
Dave Burke
6993a07d62
am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
...
* commit 'd7035c58b006b62084232c8db6c4f7c4002170cc':
Fix a hang in SF caused by invalid transform matrix from the WM
2011-10-18 22:34:51 -07:00
Dave Burke
98ba099d8f
Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
2011-10-18 22:33:40 -07:00
James Dong
b1ec65e44e
am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
...
* commit '5264f6003bbcb8ca70df034379154914260cc322':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
2011-10-18 22:17:34 -07:00
James Dong
df17db9941
Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
2011-10-18 22:16:08 -07:00
Mathias Agopian
675370ab9a
am f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into ics-mr0
...
* commit 'f7613743f29f38cbbaf4ae09996c380845a17daf':
Don't call hwc set() if there is nothing new to do
2011-10-18 20:24:23 -07:00
Mathias Agopian
5ba8f366bd
am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0
...
* commit '23bf250522b7dff9acd14c5900b66b1df9c76745':
Make sure set GL state properly
2011-10-18 20:24:21 -07:00
Mathias Agopian
7c4cd93ad2
Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0
2011-10-18 20:23:22 -07:00
Mathias Agopian
265eed738d
Merge "Make sure set GL state properly" into ics-mr0
2011-10-18 20:23:15 -07:00
Mathias Agopian
118d0245ee
Add a LayerScreenshot
...
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.
Make sure to call compositionComplete() after rendering into a FBO.
Bug: 5446982, 5467587, 5466259
Change-Id: I5d8a1b4c327f9973d950cd4f4c0bca7f62825cd4
2011-10-18 20:21:47 -07:00
Eric Laurent
895146aa5c
am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
...
* commit 'ecfdd7ff468bfc861e84fe18992e26b89cc63126':
Limit AudioFlinger log.
2011-10-18 19:31:12 -07:00
Eric Laurent
70b9281f94
Merge "Limit AudioFlinger log." into ics-mr0
2011-10-18 19:29:39 -07:00
Dirk Dougherty
dc7a4aa0ea
am cd815fc5: Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0
...
* commit 'cd815fc55bf998578461a95daf8d8fe4a6522961':
Doc change: Add Android 4.0 Platform Highlights
2011-10-18 18:04:33 -07:00
Dirk Dougherty
985573e153
Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0
2011-10-18 18:02:35 -07:00
Romain Guy
cb3a39f004
Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer"
2011-10-18 17:57:22 -07:00
Scott Main
f0a7b09e3b
am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0
...
* commit 'f49ee00f9e1975887142695e0040cd5dc410b9db':
docs: fix platform highlights
2011-10-18 17:51:42 -07:00
Jim Miller
c469d21e08
am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
...
* commit '06398768ec048cf05717ee44b81cb357fdc896dd':
Fix 5288804: Make music trasports in lockscreen more closely match design
2011-10-18 17:51:41 -07:00
Scott Main
8fa085c13d
Merge "docs: fix platform highlights" into ics-mr0
2011-10-18 17:49:32 -07:00
Jim Miller
8a95411bba
Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
2011-10-18 17:49:28 -07:00
Jason Sams
61eb08d140
Merge "Add mandelbrot to compute perf"
2011-10-18 17:44:33 -07:00
Mathias Agopian
3a3cad30c4
Don't call hwc set() if there is nothing new to do
...
there was situations where SF's main loop would run (as if there was
an invalidate), but the dirty region was empty (so no new buffers
were retired). In this case we return early and don't swap, which
would cause drawing artifacts.
Bug: 5476838
Change-Id: Id3b7bf4b7aabec7919c50d9278eb2165973a4c3d
2011-10-18 17:39:09 -07:00
Scott Main
1a33895122
am 4de8cb50: Merge "docs: update homepage for ICS announcement" into ics-mr0
...
* commit '4de8cb509bfefb920b6696209f659810dfd06e6e':
docs: update homepage for ICS announcement
2011-10-18 17:36:15 -07:00
Scott Main
14d09d108c
Merge "docs: update homepage for ICS announcement" into ics-mr0
2011-10-18 17:34:23 -07:00
Robert Ly
8e373dcd36
am 8f8e14c1: Merge "docs: change compatibility package to support package and update rel notes for r4" into ics-mr0
...
* commit '8f8e14c11c9680f5c62245f3fcc3774f8d23c05a':
docs: change compatibility package to support package and update rel notes for r4
2011-10-18 17:26:06 -07:00
Robert Ly
1f22f297a5
Merge "docs: change compatibility package to support package and update rel notes for r4" into ics-mr0
2011-10-18 17:24:02 -07:00
Robert Ly
688af51d58
am 93f97f53: Merge "docs: rs link fixes" into ics-mr0
...
* commit '93f97f53df964ec11628bf58621a1594d24e8cd7':
docs: rs link fixes
2011-10-18 17:23:11 -07:00
Scott Main
428c4adbd3
am 90889821: Merge "docs: fix misc broken links" into ics-mr0
...
* commit '90889821f1a5b1db3da8341156e9da9d2fc8f484':
docs: fix misc broken links
2011-10-18 17:21:12 -07:00
Robert Ly
27b9d3506c
Merge "docs: rs link fixes" into ics-mr0
2011-10-18 17:20:57 -07:00
Scott Main
22cde1bca0
Merge "docs: fix misc broken links" into ics-mr0
2011-10-18 17:19:14 -07:00
Jamie Gennis
13c5ca3b55
SurfaceTexture: free buffers when disconnect fails
...
This change makes SurfaceTextureClient free its references to all the
buffers even when the disconnect binder call to the SurfaceTexture
fails.
Bug: 5384823
Change-Id: Iad787fbae5fda4769546fd52276e4e4030c62be6
2011-10-18 17:14:33 -07:00
The Android Automerger
4c396a2dcb
merge in ics-mr0-release history after reset to ics-mr0
2011-10-18 16:55:49 -07:00
John Reck
4eba83bbe9
am 49dfd814: Merge "Find on page asset update" into ics-mr0
...
* commit '49dfd814acef0c4b3bc9e408969d5ffa99883664':
Find on page asset update
2011-10-18 16:39:39 -07:00
John Reck
a693d493b2
Merge "Find on page asset update" into ics-mr0
2011-10-18 16:37:03 -07:00
Eric Fischer
375eebbcff
Merge "Import revised translations."
2011-10-18 16:27:32 -07:00
Christopher Tate
e5477938bf
Merge "Fix full backup of shared storage"
2011-10-18 16:19:37 -07:00
Scott Main
5b4fac8234
am a25a9975: Merge "docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button" into ics-mr0
...
* commit 'a25a99759774206ec8712af95bba9aec47034e0e':
docs: more ics overview changes... reorg a few sections, revise intro paragraph also update API levels doc with ICS version add info about system themes and using an options menu button
2011-10-18 15:58:21 -07:00