Dianne Hackborn
47f8367ab7
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
827d069afb
Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
2011-10-19 11:06:05 -07:00
Winson Chung
b5968c780d
Manually merging screenshot notification string changes to master.
...
Change-Id: I35468b5e641078d772c19505765db90adea2445b
2011-10-19 11:04:17 -07:00
Michael Jurka
fb7d082a87
am c1c24304: am 9a76afff: Merge "Make Recent Apps faster" into ics-mr0
...
* commit 'c1c24304316b3cd3bef89169de5aeb33564e756a':
Make Recent Apps faster
2011-10-19 10:35:23 -07:00
Ben Komalo
4fce312701
am 667580b7: am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0
...
* commit '667580b716b36a8afbf8d910e14f0249eccd44c9':
Fix remote device wipe to not hang.
2011-10-19 10:35:21 -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
Gilles Debunne
5ac84423a2
Typo in ViewRootImpl
...
Change-Id: I4a5acfb091ce05f56cdbaa0a56809f377cbf9b39
2011-10-19 09:35:58 -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
7ad8aba050
am e68a6936: Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."
...
* commit 'e68a6936c7b3d3a041feeff9661b234a25e56e73':
Refactor FileInserter in MediaScanner and adding unit tests for the newly added class.
2011-10-19 07:52:28 -07:00
satok
44619d3e08
Update links for SampleSpellCheckerService for I938ba499
...
Change-Id: I528fc5ee5f9971ecb3bf47ef1c8b999546724c1f
2011-10-19 23:52:03 +09: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
Daniel Sandler
8cc36e5728
Auto-close if you swipe away the last notification.
...
Matias, I think this will enchant you.
Bug: 4902177
Change-Id: I748b62d3928519455b6b98b0b074a1204e2fdb4b
2011-10-19 10:33:35 -04:00
The Android Open Source Project
19d0863214
am 47154025: Reconcile with ics-mr0-release
...
* commit '4715402557a483eda853186e32ff6a552023a5fe':
2011-10-19 07:25:32 -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
503a48997b
am 2696d052: am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
...
* commit '2696d0520f9b928264caa5f98c2e6b1e749f9a11':
Add a LayerScreenshot
2011-10-18 23:02:14 -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
Daniel Sandler
9cbd360a67
Lazily fetch the status bar service.
...
Works around a timing issue in the lockscreen's connection
to the status bar.
Bug: 5479833
Change-Id: I043441b94db74df3e4319dd7bfb7635446cdc5d6
2011-10-19 01:41:29 -04:00
Dave Burke
1468226ce5
am 3254774b: am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
...
* commit '3254774b923378116cc7f9706431bd56f08bdd38':
Fix a hang in SF caused by invalid transform matrix from the WM
2011-10-18 22:36:42 -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
dc8bbe79b8
Check whether media recorder client exists before dumping.
...
Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82
related-to-bug: 5477177
2011-10-18 22:29:20 -07:00
James Dong
278e53a3e0
am 3c563ce6: 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 '3c563ce672e6b1827b33ab4ce0f0c28e894214d5':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
2011-10-18 22:19:30 -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
f1bdac788f
am 960a0b48: am f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into ics-mr0
...
* commit '960a0b4813a9099d2c96a54b11920d8bf6ba87d3':
Don't call hwc set() if there is nothing new to do
2011-10-18 20:26:22 -07:00
Mathias Agopian
3e80f44d52
am 43d109c2: am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0
...
* commit '43d109c2c8a278c4d2a316d70a929f961837da8f':
Make sure set GL state properly
2011-10-18 20:26:21 -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
84c760f3e3
am a6f4fb1f: am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
...
* commit 'a6f4fb1fbbaf6cb13ad6b813a4cecbc28ba02776':
Limit AudioFlinger log.
2011-10-18 19:33:38 -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
Joe Onorato
719196ad95
Merge "Revert "Treat parcelables as flattenables for now, until the sdk contains a newer aidl."" into ics-aah
2011-10-18 18:19:32 -07:00
Joe Onorato
2be34eece2
Revert "Treat parcelables as flattenables for now, until the sdk contains a newer aidl."
...
This reverts commit 234b5a2b98471c663811f4b2b44a98028fa8e623.
2011-10-18 18:17:32 -07:00
Dirk Dougherty
1e2fae4bda
am bafa2ca4: am cd815fc5: Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0
...
* commit 'bafa2ca4f124a08f0c1b114a63172d168b682c2b':
Doc change: Add Android 4.0 Platform Highlights
2011-10-18 18:06:34 -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
Svetoslav Ganov
e261e283ea
Add content description setter to RemoteViews
...
bug:5480389
Change-Id: I66616f379a244ba7f3552d766f3aaa77f207550a
2011-10-18 18:01:47 -07:00
Romain Guy
08be2392fe
am caabc81f: Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer"
...
* commit 'caabc81f0fb50770eee13a78b20b81c00c87d83b':
Notify a Bitmap is has changed when calling copyPixelFromBuffer
2011-10-18 17:58:26 -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
b3959077b7
am c0632572: am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0
...
* commit 'c06325727f6f784f873e45cdbc8e4ddcc5de9aab':
docs: fix platform highlights
2011-10-18 17:53:35 -07:00
Jim Miller
0262b4de1b
am 90e4ad00: am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
...
* commit '90e4ad00a785e99a84214d363bdf8d86d5e2799b':
Fix 5288804: Make music trasports in lockscreen more closely match design
2011-10-18 17:53:33 -07:00