John Reck
3bae94d78e
resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp
...
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
2014-12-09 15:38:38 -08:00
John Reck
fe11126d23
am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
...
* commit '4f1942d999c60fd91cb826651b6d978d47a74321':
Teach AssetAtlas about more drawables
2014-12-09 23:18:08 +00:00
John Reck
4f1942d999
Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
2014-12-09 23:12:42 +00:00
John Reck
dad7d84c04
Teach AssetAtlas about more drawables
...
Bug: 18317479
Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
2014-12-09 14:18:33 -08:00
John Reck
389baa3951
am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
...
* commit '7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
Fix issue with RNA destruction mid-animation
2014-12-09 22:18:27 +00:00
John Reck
7d74cb6c61
am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
...
* commit '14c436897ca56800a3758008f0631c559a898967':
Fix issue with RNA destruction mid-animation
2014-12-09 22:08:42 +00:00
John Reck
c47c98be04
Fix issue with RNA destruction mid-animation
...
Bug: 18521508
Fix an issue where an RNA's native object was destroyed
before the java-side object was started
Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
2014-12-09 12:35:12 -08:00
Svet Ganov
aad2ffe67a
am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
...
* commit '7f980d7508cab2bc9c4f84e5ea15984e284dbbb7':
When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 00:17:31 +00:00
Svet Ganov
2dbd133c96
am a91256bc: am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
...
* commit 'a91256bc75e510a254d4e5c6e8d1df8391f20bba':
Clear clicked nodes from the accessibiliy cache.
2014-12-09 00:17:24 +00:00
Svet Ganov
7f980d7508
am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
...
* commit '381a423634a293d53f972a0ce4abd7fe7cf7d703':
When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 00:07:06 +00:00
Svet Ganov
a91256bc75
am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
...
* commit 'e232d4a6aadbd32cb80ffd0da9a5d164910b1b79':
Clear clicked nodes from the accessibiliy cache.
2014-12-09 00:07:01 +00:00
Svet Ganov
381a423634
Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
2014-12-08 21:28:19 +00:00
Svet Ganov
e232d4a6aa
Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
2014-12-08 21:08:36 +00:00
Alan Viverette
5a50a8bcab
am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
...
* commit 'e615da7eb74907c7df993009ba8137e6ddd4ac62':
Fix hotspot coordinate propagation in ViewGroup and AbsListView
2014-12-08 19:45:20 +00:00
Filip Gruszczynski
5ae61a811a
am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
...
* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
Private Window flag to disable touch events in WallpaperService.
2014-12-08 19:13:39 +00:00
Svetoslav
f477aeb367
am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.
...
* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
Ensure all events from a showing window are dispatched.
2014-12-08 19:12:22 +00:00
Alan Viverette
e615da7eb7
am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
...
* commit 'f1792c4219fb341a59c4b90c0ce5dd6e0e7b87f0':
Fix hotspot coordinate propagation in ViewGroup and AbsListView
2014-12-08 18:47:46 +00:00
Alan Viverette
b942b6f15c
Fix hotspot coordinate propagation in ViewGroup and AbsListView
...
There was a weird disconnect between setPressed() and hotspot propagation
behavior. This makes hotspot propagation work like setPressed(). Also
fixes ripple animation during drag-to-open.
BUG: 18631557
BUG: 18593243
Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
2014-12-08 10:37:39 -08:00
Svet Ganov
0322100598
Clear clicked nodes from the accessibiliy cache.
...
Nodes that are clicked can change state as a result of a click,
e.g. a check box. The accessibility service may decide to get the
source node from the click event to probe its state and get a
cached state since the window content changed event is after the
click one. Therefore, we have to clear the state of the click
event's source from the cache to ensure the client can query the
latest state of that source.
bug:18625975
Change-Id: I9e339c2fdcf74f260bb8ad86b9b873f7ddd75f19
2014-12-05 16:52:31 -08:00
Svet Ganov
b3fa2787ea
When accessibility on cannot click on a view covered by a HorizontalScrollView
...
In accessibility mode we send down and up events activate a view. We will later
switch to accessibility actions but for now as a bridge-gap we compute a point on
the screen where to click for activating the view. The heuristic we use has edge
cases such as a view that handles all touch events but does not have any listeners.
In this case we do not ignore the target view's area covered by a view that handles
all touch events. As a result we click on the wrong target. While we cannot solve
this generically, in the case of standard components such as HorizontalScrollView
we can.
bug:18612258
Change-Id: If8482aac0d0ea53c5c90367d099d1b8d3a4559ed
2014-12-05 13:13:15 -08:00
Filip Gruszczynski
f5d1cf0b19
am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
...
* commit '26af8c197c17487ac0400a7a3310037e57eda2a0':
Private Window flag to disable touch events in WallpaperService.
2014-12-05 02:40:38 +00:00
Filip Gruszczynski
26af8c197c
am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
...
* commit '26b187711fdf6224e14df465a58f30f510011b49':
Private Window flag to disable touch events in WallpaperService.
2014-12-05 02:34:26 +00:00
Svetoslav
ed068f7c30
am 3a0d878a: Ensure all events from a showing window are dispatched.
...
* commit '3a0d878ab56475276c61d574af7651820a5cea5a':
Ensure all events from a showing window are dispatched.
2014-12-05 00:45:51 +00:00
Svetoslav
3a0d878ab5
Ensure all events from a showing window are dispatched.
...
Accessibility services may opt-in to introspect the interactive
windows on the screen. If window introspection is enabled there
is a case where some events from a showing window are received
before the updated window state from the window manager. Now the
window manager sends over the windows before notifying the app
for the focus change.
bug:18625996
Change-Id: Ic481e01efbe12dc92f090f799feeb236672fc7b3
2014-12-05 00:37:38 +00:00
Filip Gruszczynski
b8c0694ae8
Private Window flag to disable touch events in WallpaperService.
...
Change-Id: I18b46340f89cbea0b6daeb1efe9c31656f4e1a5d
2014-12-04 15:02:18 -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
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
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
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
2b36a86b8e
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
...
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit b35c9602cf )
2014-11-24 17:59:38 +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
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