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
Scott Main
67319b7ab2
am 35f78f30: Merge "docs: add package summary for spell checker services" into ics-mr0
...
* commit '35f78f30f39832ca8f6cd21140d501c53a2aa826':
docs: add package summary for spell checker services
2011-10-18 15:55:33 -07:00
Scott Main
fd4c0d0a44
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
2011-10-18 15:55:25 -07:00
Scott Main
8710aee977
Merge "docs: add package summary for spell checker services" into ics-mr0
2011-10-18 15:54:04 -07:00
Brian Colonna
246792d3f4
am 2720cfae: Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0
...
* commit '2720cfae624770674122640f2d4a3f55702d80ff':
Fix 5433466 - FU out of position during orientation change
2011-10-18 15:49:12 -07:00
Brian Colonna
319b724cff
Merge "Fix 5433466 - FU out of position during orientation change" into ics-mr0
2011-10-18 15:46:54 -07:00
Winson Chung
69b5b119f8
am ee5aa0e8: (-s ours) Merge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)" into ics-mr0
...
* commit 'ee5aa0e867657f06b63f1582f23af1cc1799f19a':
DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)
2011-10-18 15:45:55 -07:00
Winson Chung
4381e839cf
am 9beac371: Merge "Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)" into ics-mr0
...
* commit '9beac371dd3f3977c3e0ab471a776a5191590f63':
Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)
2011-10-18 15:45:53 -07:00
Winson Chung
ab852eaff9
Merge "DO NOT MERGE. Updating screenshot notification strings. (Bug: 5333706)" into ics-mr0
2011-10-18 15:44:04 -07:00
Winson Chung
e5845dc94c
Merge "Fixing issue where screenshot intent to file path did not show other screenshots. (Bug: 5333706)" into ics-mr0
2011-10-18 15:44:01 -07:00
Mathias Agopian
c492e67810
Make sure set GL state properly
...
when taking a screenshot, in particular, we could end up
with stale GL state when drawing LayerDim which resulted
in incortect rendering.
Bug: 5467587
Change-Id: Id9fbed2843481d31063620f3662b364c7e3ac781
2011-10-18 15:32:57 -07:00
Jim Miller
16346b60da
am f13313a0: Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0
...
* commit 'f13313a073ad3f3c4e91baa4adbfdec66395065e':
Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen
2011-10-18 15:12:02 -07:00
Jim Miller
d0c7378baa
Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0
2011-10-18 15:10:04 -07:00
Joe Fernandez
24c7d2b9f1
am 3f70aa78: Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0
...
* commit '3f70aa783cca9f4c331c2a1b390bb7bebc6e248c':
docs: Camera JavaDoc - added xref to Camera DevGuide
2011-10-18 15:03:23 -07:00
Joe Fernandez
8035a00cf1
Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0
2011-10-18 15:02:00 -07:00
Fred Quintana
598e29e40b
am 6d076a42: Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called." into ics-mr0
...
* commit '6d076a425ab10441996ebe194b0c181d16912ece':
fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called.
2011-10-18 14:45:35 -07:00
Fred Quintana
eedc890d55
Merge "fix bug where the instance saving of the ChooseTypeAndAccountActivity would only work in the case where onSaveInstanceState was called." into ics-mr0
2011-10-18 14:43:06 -07:00
Dianne Hackborn
28cf9f4125
am 535f6eac: Merge "Fix issue #5461497 : Landed on Welcome screen after a tap on \'Next\' in Screen 500" into ics-mr0
...
* commit '535f6eacb9bd508caac463a12ab69be1cd58c5a5':
Fix issue #5461497 : Landed on Welcome screen after a tap on 'Next' in Screen 500
2011-10-18 14:36:31 -07:00
Dianne Hackborn
80ce665ba2
Merge "Fix issue #5461497 : Landed on Welcome screen after a tap on 'Next' in Screen 500" into ics-mr0
2011-10-18 14:34:08 -07:00
Michael Chan
488165e8c0
Merge "Update comment on required fields for an event"
2011-10-18 14:33:10 -07:00
Robert Greenwalt
e140f650c8
am dd466152: Merge "Initialize Hipri correctly." into ics-mr0
...
* commit 'dd466152dd1b88f7b5bd73c47715eb84b76e6dab':
Initialize Hipri correctly.
2011-10-18 14:31:47 -07:00
Robert Greenwalt
eddfdbc51b
Merge "Initialize Hipri correctly." into ics-mr0
2011-10-18 14:29:50 -07:00
Chet Haase
1ecfabbe5a
am 87bc53de: Merge "Make notification panel delete-all animation smoother" into ics-mr0
...
* commit '87bc53de2adf479ad5a5e226bf3d8fd31af6dc21':
Make notification panel delete-all animation smoother
2011-10-18 13:46:45 -07:00
Chet Haase
069dff2f53
Merge "Make notification panel delete-all animation smoother" into ics-mr0
2011-10-18 13:45:00 -07:00
Wink Saville
58da67c033
am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0
...
* commit '07848843b23e10e4728fa779cc79fc38a341cf6b':
Add DataConnection#isEmergency and use in trySetupData.
2011-10-18 13:38:09 -07:00
Wink Saville
c6512c062c
Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0
2011-10-18 13:35:43 -07:00
Jim Miller
3c1ccfe857
am 8e6d75af: Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0
...
* commit '8e6d75affa1a802b01aa38ad765d1ae9f998c0ab':
Fix 5473038: workaround for fd leak in lockscreen
2011-10-18 13:12:10 -07:00
Jim Miller
b13af61769
Merge "Fix 5473038: workaround for fd leak in lockscreen" into ics-mr0
2011-10-18 13:10:24 -07:00
Jake Hamby
d011eff135
am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0
...
* commit 'f522e095e69406a5c6039b406237e9b30781a355':
Add wrapper method to GsmAlphabet for API compatibility.
2011-10-18 12:24:25 -07:00
Jake Hamby
5884e9eb26
Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0
2011-10-18 12:22:39 -07:00
Svetoslav Ganov
26b25e1ac3
am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0
...
* commit '601d5817301bc79c34c30e7b606fe872b2b76c31':
TouchExplorer crashes if there is incative pointer while dragging.
2011-10-18 11:54:03 -07:00
Michael Jurka
3d46341b90
am 6d9d17fd: Merge "Visual changes to recent apps" into ics-mr0
...
* commit '6d9d17fdd299642330dac321a9fa4099abaae220':
Visual changes to recent apps
2011-10-18 11:51:52 -07:00
Svetoslav Ganov
74f938195e
Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0
2011-10-18 11:51:29 -07:00