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
John Reck
608c245ba7
am de620d06: am 51ce9cac: am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev
...
* commit 'de620d06ffe3570f7a4548db22428aa7ba37b252':
Don't invalidate() on setClipBounds
2014-11-18 22:00:07 +00:00
John Reck
de620d06ff
am 51ce9cac: am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev
...
* commit '51ce9cacb66d1ddac115c15375ca174d8b3eaf79':
Don't invalidate() on setClipBounds
2014-11-18 21:51:40 +00:00
John Reck
c773f42858
am cff98630: am fcd38813: am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev
...
* commit 'cff98630e75eda78864c3f2559fa2023e1fae749':
Fix invalidateOutline
2014-11-18 21:51:07 +00:00
John Reck
51ce9cacb6
am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev
...
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
Don't invalidate() on setClipBounds
2014-11-18 21:46:44 +00:00
John Reck
cff98630e7
am fcd38813: am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev
...
* commit 'fcd38813efad32f13d472ef6e99e47b3b9db8f28':
Fix invalidateOutline
2014-11-18 21:45:13 +00:00
John Reck
37cdc191e3
Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev
2014-11-18 21:41:17 +00:00
John Reck
fcd38813ef
am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev
...
* commit '3cf61d4b79a22f89b8fb839ef9ee2146fac4e703':
Fix invalidateOutline
2014-11-18 21:37:40 +00:00
John Reck
9029e5ecd0
Don't invalidate() on setClipBounds
...
Bug: 17510133
This is a RenderNode property now, so use
the faster invalidateViewProperty() shortcut
since a re-record isn't necessary
Change-Id: If3999bce9a1fb9b60e42f0ee624bb554361f96ac
2014-11-17 15:28:55 -08:00
John Reck
c99d3c99f8
Fix invalidateOutline
...
Bug: 18175261
invalidateOutline was switched to a lazy-method, but this doesn't
work because invalidateViewProperty intentionally does not
do a traversal, therefore the invalidate was never consumed.
However it was attempting to be lazy about work that is cheap to
do, so nuke the lazy aspect and restore invalidateOutline's previous,
correct behavior. rebuildOutline is kept to avoid triggering
traversals in places they are not needed
Change-Id: I70f8cbacd54a607c0bf0bc7fe6eea78554cb2ea3
2014-11-17 12:35:53 -08:00
John Reck
17762bb9c7
am 64b5e00a: am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
...
* commit '64b5e00aaa53dbca59e8b997184bf479f68915eb':
Wire up surface width/height to lockHardwareCanvas
2014-11-17 15:31:12 +00:00
John Reck
64b5e00aaa
am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
...
* commit 'ff5978988abceeb0f2c8324a9ab66b7c958edd34':
Wire up surface width/height to lockHardwareCanvas
2014-11-17 15:27:43 +00:00
John Reck
ff5978988a
am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
...
* commit 'b3ec64e1005c82d41b6d1a1d86b6933fd25d87d2':
Wire up surface width/height to lockHardwareCanvas
2014-11-17 15:23:11 +00:00
John Reck
b3ec64e100
Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
2014-11-17 15:19:23 +00:00
Chris Craik
b165296a9c
Update clipToPadding docs
...
Clarify that it doesn't clip anything but children,
and only if padding is non-zero.
Change-Id: I3e3ae31f52fc22304eb13d88765f9f4fc6e43e66
2014-11-14 17:05:06 -08:00
John Reck
eb4afaeedd
am ff0c4856: am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev automerge: f1812b1
...
* commit 'ff0c4856f4f912f483c8293a72657d82b1dd14a9':
Document that circular reveal is async
2014-11-14 23:05:36 +00:00
John Reck
ff0c4856f4
am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev
...
automerge: f1812b1
2014-11-14 22:58:50 +00:00
