John Reck
1022888d33
resolved conflicts for merge of 203c8171 to master
...
Change-Id: I256397410c261fae049bae4572f132235be1c5c9
2014-12-04 16:06:34 -08:00
John Reck
9fb42f0778
resolved conflicts for merge of a75b0ad3 to master
...
Change-Id: I32a2d129c556407727ada909daa6470309d42499
2014-12-04 13:51:41 -08:00
Derek Sollenberger
203c817180
am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 21:46:39 +00:00
John Reck
a75b0ad384
resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp
...
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
2014-12-04 13:41:04 -08:00
Derek Sollenberger
c1a2f38ce0
am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit '4d9da135caf8d4f38bb728343c1aabbf45f81d5b':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 15:17:01 +00:00
John Reck
a51a0901ad
am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
...
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
Resume RT-animations after a pauseSurface
2014-12-04 15:15:27 +00:00
Derek Sollenberger
4d9da135ca
Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
2014-12-04 13:04:52 +00:00
John Reck
01a5ea35fb
Resume RT-animations after a pauseSurface
...
Bug: 18203577
The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.
To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.
Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
2014-12-03 13:03:59 -08:00
Derek Sollenberger
f29d5a5b21
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
...
bug:18306529
Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
2014-12-03 13:43:30 -05:00
Chris Craik
f9550fa061
am faf4a61a: am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
...
* commit 'faf4a61a88136d26935728e06b7916f1f31afdbd':
Sync ViewOverlay size init with RenderNode
2014-12-02 17:19:21 +00:00
Chris Craik
faf4a61a88
am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
...
* commit '363f0d9fd92129c07d769e43fbc9b46dacc01a3b':
Sync ViewOverlay size init with RenderNode
2014-12-02 17:13:08 +00:00
Chris Craik
363f0d9fd9
am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
...
* commit '81defc6a840367dcf9591d14b827f2d8d756ef00':
Sync ViewOverlay size init with RenderNode
2014-12-02 17:04:34 +00:00
Chris Craik
81defc6a84
Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
2014-12-02 16:59:21 +00:00
Chris Craik
2180ba7abd
Sync ViewOverlay size init with RenderNode
...
bug:18381202
Setting mRight/mBottom must be accompanied by updating the RenderNode.
Change-Id: I4dae06a5ca43247b0b3642d85808e2724e486692
2014-12-01 17:55:37 -08:00
Alan Viverette
c883153d64
am b08a028d: am 23dc0563: am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
...
* commit 'b08a028da62895ae646f129c15c61e8dda955175':
Fix visible rect computation for views with padding
2014-12-01 22:24:15 +00:00
Alan Viverette
b08a028da6
am 23dc0563: am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
...
* commit '23dc05634d7bc4a1d436b27dc4cd8bc518834e49':
Fix visible rect computation for views with padding
2014-12-01 22:18:58 +00:00
Alan Viverette
23dc05634d
am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
...
* commit 'e6bd61d5bbea012b6b80c8bff915042f615630bc':
Fix visible rect computation for views with padding
2014-12-01 22:12:44 +00:00
Alan Viverette
e6bd61d5bb
Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
2014-12-01 22:06:13 +00:00
Wale Ogunwale
0ea8edef69
am ea64d0be: am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
...
* commit 'ea64d0beea59e3350bea0c6fe8d7cef807f82601':
Added unique id to display devices and their settings.
2014-12-01 20:44:06 +00:00
Wale Ogunwale
ea64d0beea
am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
...
* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
Added unique id to display devices and their settings.
2014-12-01 20:37:01 +00:00
Wale Ogunwale
e05fbd6901
am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
...
* commit '997e632f59b070dabf71d9e807847c0643da92ac':
Added unique id to display devices and their settings.
2014-12-01 20:30:33 +00:00
Alan Viverette
ab2cf6dafe
Fix visible rect computation for views with padding
...
Previously, the computation was double-counting the left and top padding
because it was treating the third and fourth Rect.intersect() arguments
as width and height rather than right and bottom.
BUG: 18418091
Change-Id: I2ab669ee5060372ae11cfe804dcc05c7426be1ec
2014-11-26 14:34:36 -08:00
Wale Ogunwale
361ca21acc
Added unique id to display devices and their settings.
...
The display setting saved to disk were using a localized name for
the key. This is an issue if the user changes languages after the
display settings have been saved. We now use the non-localized
name for the display to access the settings if it is available,
else we fall back on the localized name.
Bug: 18190800
Change-Id: I837c06a8935df10727229a1aa2bb6eeb3953707f
2014-11-26 13:40:52 -08:00
John Reck
82cb15199a
am cbee971a: resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp
...
* commit 'cbee971a105adcf071b89838818f31b37388e9b9':
It's super critical to call nStart
2014-11-22 01:14:12 +00:00
John Reck
cbee971a10
resolved conflicts for merge of 08372601 to lmp-mr1-dev-plus-aosp
...
Change-Id: I86b78ada4f30c23ae1232ac5a509986d5b8dc546
2014-11-21 17:07:17 -08:00
John Reck
08372601ab
am 418c8549: Merge "It\'s super critical to call nStart" into lmp-mr1-dev
...
* commit '418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71':
It's super critical to call nStart
2014-11-21 23:37:52 +00:00
John Reck
418c8549dc
Merge "It's super critical to call nStart" into lmp-mr1-dev
2014-11-21 23:32:08 +00:00
Bryce Lee
2388c814a0
am 296ea917: am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev
...
* commit '296ea9174222e64085a66a238e6df13b8b378b1e':
Make default windows features configurable.
2014-11-21 22:33:01 +00:00
John Reck
72d6e4facb
It's super critical to call nStart
...
Bug: 18204974
Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set
Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished
Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
2014-11-21 14:27:21 -08:00
Chris Craik
90102e1009
am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
...
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
Revert "Add a way to override Xfermode DO NOT MERGE"
2014-11-21 22:21:02 +00:00
Chris Craik
1ae8a98e8a
am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
...
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff':
Revert "Add a way to override Xfermode DO NOT MERGE"
2014-11-21 22:13:30 +00:00
Chris Craik
6bcf223bf6
Merge "Revert "Add a way to override Xfermode""
2014-11-21 22:11:14 +00:00
Chris Craik
29dc496a42
Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
2014-11-21 22:11:13 +00:00
Chris Craik
da3198a550
Revert "Add a way to override Xfermode"
...
Feature no longer needed.
bug:18448377
This reverts commit c495e611b9
2014-11-21 22:05:46 +00:00
Chris Craik
69e65019b0
Revert "Add a way to override Xfermode DO NOT MERGE"
...
Feature no longer needed.
bug:18448377
This reverts commit 4678dcc552
2014-11-21 22:05:33 +00:00
Bryce Lee
296ea91742
am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev
...
* commit 'deee5566417af229a142cf8c1964e98a356513e4':
Make default windows features configurable.
2014-11-21 19:27:55 +00:00
Bryce Lee
deee556641
am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev
...
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
Make default windows features configurable.
2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5
Merge "Make default windows features configurable." into lmp-mr1-dev
2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a
Make default windows features configurable.
...
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
2014-11-21 11:08:45 -08:00
Filip Gruszczynski
b898936a00
am 5a429758: am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37
...
* commit '5a429758e9df7b49c616105b510eff42bf7bde69':
SwipeDismissLayout makes activity opaque only after entry animation ends.
2014-11-21 12:19:45 +00:00
John Reck
565e9be4ac
am 51efa8ef: am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev automerge: d3e5777
...
* commit '51efa8ef3f3faeec5772fccf46f629f2e44853c2':
If the surface is lost, release it
2014-11-21 12:17:33 +00:00
Narayan Kamath
57616d3e55
resolved conflicts for merge of 18e3727f to master
...
Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066
2014-11-21 11:57:07 +00:00
Filip Gruszczynski
5a429758e9
am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37
...
* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
SwipeDismissLayout makes activity opaque only after entry animation ends.
2014-11-21 10:26:31 +00:00
Filip Gruszczynski
5ea0411f39
am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37
...
* commit 'a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
SwipeDismissLayout makes activity opaque only after entry animation ends.
2014-11-21 10:21:19 +00:00
Filip Gruszczynski
a83c5806de
Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
...
automerge: 96c5d37
2014-11-21 10:13:59 +00:00
John Reck
51efa8ef3f
am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev
...
automerge: d3e5777
2014-11-21 02:56:03 +00:00
John Reck
18e3727f68
am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev
...
automerge: 9b5d427
2014-11-21 02:55:00 +00:00
Alan Viverette
4d6b1549a7
am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev
...
automerge: aed1268
2014-11-21 02:23:47 +00:00
Alan Viverette
aed12685b0
am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev
...
* commit 'a19f057792e21879f0f071f361c13bc9e41f6a9d':
Move default token handling into WindowManagerImpl
2014-11-21 01:38:26 +00:00
Chris Craik
06e7fe5a70
resolve merge conflicts of f2235b6 to master.
...
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
2014-11-20 17:27:36 -08:00
