60250 Commits

Author SHA1 Message Date
Winson Chung
b5968c780d Manually merging screenshot notification string changes to master.
Change-Id: I35468b5e641078d772c19505765db90adea2445b
2011-10-19 11:04:17 -07:00
Michael Jurka
c1c2430431 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
667580b716 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
9a76afff4d Merge "Make Recent Apps faster" into ics-mr0 2011-10-19 10:04:19 -07:00
Ben Komalo
8408e5165a Merge "Fix remote device wipe to not hang." into ics-mr0 2011-10-19 09:32:50 -07:00
Marco Nelissen
e68a6936c7 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
4715402557 Reconcile with ics-mr0-release
Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b
2011-10-19 07:23:01 -07:00
The Android Automerger
1f74cb9e9d merge in ics-mr0-release history after reset to ics-mr0 2011-10-19 06:28:30 -07:00
Dave Burke
2696d0520f am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
* commit '70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
  Add a LayerScreenshot
2011-10-18 23:00:08 -07:00
Dave Burke
70ac412b2f Merge "Add a LayerScreenshot" into ics-mr0 2011-10-18 22:58:09 -07:00
Dave Burke
3254774b92 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
d7035c58b0 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
3c563ce672 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
5264f6003b 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
960a0b4813 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
43d109c2c8 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
f7613743f2 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
23bf250522 Merge "Make sure set GL state properly" into ics-mr0 2011-10-18 20:23:15 -07:00
Mathias Agopian
0ab84ef507 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
Mathias Agopian
526f0a0e15 Fix a hang in SF caused by invalid transform matrix from the WM
WindowManager could create by transforms because of divide by zero.

Bug: 5422468
Change-Id: I782f87ebb78b5ff23750e22837f36ca6cfed1f2f
2011-10-18 20:21:47 -07:00
Eric Laurent
a6f4fb1fbb am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
* commit 'ecfdd7ff468bfc861e84fe18992e26b89cc63126':
  Limit AudioFlinger log.
2011-10-18 19:31:12 -07:00
Eric Laurent
ecfdd7ff46 Merge "Limit AudioFlinger log." into ics-mr0 2011-10-18 19:29:39 -07:00
Dirk Dougherty
bafa2ca4f1 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
cd815fc55b Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0 2011-10-18 18:02:35 -07:00
Romain Guy
caabc81f0f Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer" 2011-10-18 17:57:22 -07:00
Romain Guy
2c183fa5bf Notify a Bitmap is has changed when calling copyPixelFromBuffer
Change-Id: Ibff1a162edfe11473c5c167e764405bf83ec5822
2011-10-18 17:56:06 -07:00
Scott Main
c06325727f 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
90e4ad00a7 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
f49ee00f9e Merge "docs: fix platform highlights" into ics-mr0 2011-10-18 17:49:32 -07:00
Jim Miller
06398768ec Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0 2011-10-18 17:49:28 -07:00
Dirk Dougherty
052ab1a5b7 Doc change: Add Android 4.0 Platform Highlights
Change-Id: If508648991eaae02d8ee9c16626ccac3a31e6078
2011-10-18 17:48:10 -07:00
Jason Sams
2e22144891 Merge "Add mandelbrot to compute perf" 2011-10-18 17:44:33 -07:00
Robert Ly
a94c7bdcf8 docs: fix platform highlights
Change-Id: I876a78661f2198eb8992f0183736de454cd2c4bc
2011-10-18 17:44:02 -07:00
Mathias Agopian
0d0fba4587 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
6629a1054a 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
4de8cb509b Merge "docs: update homepage for ICS announcement" into ics-mr0 2011-10-18 17:34:23 -07:00
Scott Main
4c84ee2785 docs: update homepage for ICS announcement
Change-Id: Ida9f245910075df26c4fedf9a61c657079e5cc41
2011-10-18 17:32:36 -07:00
Jason Sams
02bd36369b Add mandelbrot to compute perf
Change-Id: I8217134a703fcd72f6c9a3bdd4e2a6b389ea0fd3
2011-10-18 17:31:02 -07:00
Robert Ly
abada5d02d 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
8f8e14c11c 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
6b8c7f87b0 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
3a9cf54931 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
93f97f53df Merge "docs: rs link fixes" into ics-mr0 2011-10-18 17:20:57 -07:00
Scott Main
90889821f1 Merge "docs: fix misc broken links" into ics-mr0 2011-10-18 17:19:14 -07:00
Robert Ly
849759380e docs: rs link fixes
Change-Id: I5c8e16a914b314522da3ba6f1a75c36a831b4668
2011-10-18 17:16:17 -07:00
Scott Main
19aad293c0 docs: fix misc broken links
Change-Id: Ie0406bce6c4f1fa03b16bba76ed82ac75bfbb5f7
2011-10-18 16:57:32 -07:00
The Android Automerger
9038cb343b merge in ics-mr0-release history after reset to ics-mr0 2011-10-18 16:55:49 -07:00
Robert Ly
8db858f1dd docs: change compatibility package to support package and update rel notes for r4
Change-Id: I57496090c207fc347adc144a66346b44479570ee
2011-10-18 16:52:32 -07:00
John Reck
ee4ebb1081 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
49dfd814ac Merge "Find on page asset update" into ics-mr0 2011-10-18 16:37:03 -07:00