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
Chris Craik
f2235b6a48
resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.
...
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
2014-11-20 16:38:06 -08:00
John Reck
d3e5777e79
am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev
...
* commit '83fb64e8ec4c6bc0930f50b24bd1c36a81f6a1c2':
If the surface is lost, release it
2014-11-21 00:04:18 +00:00
John Reck
83fb64e8ec
Merge "If the surface is lost, release it" into lmp-mr1-dev
2014-11-21 00:00:08 +00:00
John Reck
9b5d427fe0
am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev
...
* commit '0b2dac3452a58e76be7379b85e7505c531842b57':
Rename callDrawGLFunction
2014-11-20 23:29:31 +00:00
John Reck
0b2dac3452
Merge "Rename callDrawGLFunction" into lmp-mr1-dev
2014-11-20 23:26:07 +00:00
John Reck
680df8d60e
Rename callDrawGLFunction
...
Bug: 18471503
Change-Id: I00cb356ff2338da7fd07b9ba30b5b3dcbdffdb2e
2014-11-20 14:40:52 -08:00
Chet Haase
ab11cfa2d3
am a2b3a75c: am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev automerge: a79d2e8
...
* commit 'a2b3a75ca599c3a2334b9c81a5abd6f544615d2f':
Fix seeking and scaled duration behavior
2014-11-20 21:19:27 +00:00
Chet Haase
a2b3a75ca5
am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev
...
automerge: a79d2e8
2014-11-20 21:13:10 +00:00
Alan Viverette
a19f057792
am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev
...
* commit '8ccf071ab83510c8ef7b4d311d894d5c4a352f6c':
Move default token handling into WindowManagerImpl
2014-11-20 19:21:11 +00:00
Alan Viverette
8ccf071ab8
Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev
2014-11-20 19:16:58 +00:00
Chris Craik
57b641a2ed
am 3b2ba44b: Merge "Improve logging around performance critical events" into lmp-mr1-dev
...
* commit '3b2ba44be3699a4e133d7a09cb4ed182405d7ff9':
Improve logging around performance critical events
2014-11-20 17:50:20 +00:00
Chris Craik
3b2ba44be3
Merge "Improve logging around performance critical events" into lmp-mr1-dev
2014-11-20 17:36:26 +00:00
John Reck
b13de07f0b
If the surface is lost, release it
...
Bug: 18403246
Surface#isValid() is used throughout ViewRootImpl to
determine Surface validity. However, this will return true
until Surface#release() is called, even if the underlying
BufferQueue is abandoned. We have a very strong signal
from EGL that the Surface is now dead, so use that signal
to call Surface#release() so ViewRootImpl's isValid() usage
will be valid.
Change-Id: Ib355560ef4ca7625c3c784174863d2d55267d93d
2014-11-20 07:38:00 -08:00
Chris Craik
70850ea258
Improve logging around performance critical events
...
bug:17702227
Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.
Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
2014-11-19 17:24:30 -08:00
Alan Viverette
7c9746d4ef
Move default token handling into WindowManagerImpl
...
BUG: 18451795
Change-Id: I1fc6db988ad879fded5318f33d08a4f09da38907
2014-11-19 17:02:16 -08:00
Chet Haase
a79d2e8664
am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev
...
* commit '85603a7faf0a8067803ae6424bc590f6e2a17e07':
Fix seeking and scaled duration behavior
2014-11-20 00:07:50 +00:00
Chet Haase
85603a7faf
Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev
2014-11-20 00:02:09 +00:00
Chet Haase
0d1c27a713
Fix seeking and scaled duration behavior
...
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.
Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time
Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
2014-11-19 15:29:47 -08:00
Filip Gruszczynski
6eafa902cb
SwipeDismissLayout makes activity opaque only after entry animation ends.
...
Bug: 18340863
Change-Id: Ic60fa2463618f86b1ae23fc4a0c06cd348f28334
2014-11-19 11:05:43 -08:00
Chris Craik
22da9ba481
am 51888ef8: am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev
...
* commit '51888ef85d1350217297cb704dac80d45a1845e9':
Update clipToPadding docs
2014-11-19 00:24:04 +00:00
Chris Craik
51888ef85d
am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev
...
* commit 'df57b22bc679664138079a4f15966b19f63f0aea':
Update clipToPadding docs
2014-11-19 00:19:34 +00:00
Chris Craik
df57b22bc6
am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev
...
* commit '0455174d347bf451e830584bc3f6f35c3c560282':
Update clipToPadding docs
2014-11-19 00:09:32 +00:00
Chris Craik
0455174d34
Merge "Update clipToPadding docs" into lmp-mr1-dev
2014-11-18 23:33:30 +00:00
