Chris Craik
a609028451
Merge "Make DisplayListRenderer inherit from Canvas, merge JNI"
2015-01-05 23:31:30 +00:00
Tom Hudson
8dfaa49042
Make DisplayListRenderer inherit from Canvas, merge JNI
...
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.
Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.
bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
2015-01-05 15:25:41 -08:00
Filip Gruszczynski
2b37034c57
am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
automerge: 62ab1ca
2015-01-05 22:59:09 +00:00
Filip Gruszczynski
62ab1caa38
am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
* commit '8117eda6f18a4d388a12ab0af318c95b86280084':
Add system api for disabling touch events in wallpaper behind the window.
2015-01-05 22:56:09 +00:00
Filip Gruszczynski
8117eda6f1
am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
...
* commit '8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2':
Add system api for disabling touch events in wallpaper behind the window.
2015-01-05 22:50:29 +00:00
Filip Gruszczynski
8c6b59f46d
Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
2015-01-05 22:46:14 +00:00
Alan Viverette
8a3323adc8
am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
automerge: 4d41e49
2015-01-05 22:40:24 +00:00
Alan Viverette
4d41e49f39
am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
* commit 'bde76419c1c30aa574f8bc7b3f09f2029e080b83':
Avoid double-translating View background
2015-01-05 22:38:57 +00:00
Alan Viverette
bde76419c1
am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
...
* commit '1f3f47b3680547dbb764db173e02d833e12d65a2':
Avoid double-translating View background
2015-01-05 22:32:10 +00:00
Alan Viverette
b15703c9b4
Avoid double-translating View background
...
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.
BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
2015-01-05 14:20:42 -08:00
Filip Gruszczynski
fe56835934
Add system api for disabling touch events in wallpaper behind the window.
...
Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
2015-01-05 12:57:19 -08:00
Svetoslav
64e5f085a7
am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager.
...
automerge: 1261ee8
2014-12-29 18:32:28 +00:00
Svetoslav
1261ee87a8
am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager.
...
* commit '72da9ed8867a3b3d6a9ae829b9a0ae526c16915c':
Fix a race in accessibility manager.
2014-12-29 18:30:47 +00:00
Svetoslav
72da9ed886
am e5ea48a7: Fix a race in accessibility manager.
...
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
Fix a race in accessibility manager.
2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe
Fix a race in accessibility manager.
...
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.
bug:18840784
Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
2014-12-29 09:40:46 -08:00
Kris Giesing
0dd962db3e
Merge "Fix minor spelling and grammar errors in public JavaDoc"
2014-12-19 23:56:44 +00:00
Svet Ganov
be2fba6232
am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
...
automerge: 19ecc78
2014-12-19 22:44:52 +00:00
Svet Ganov
19ecc7847f
am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
...
* commit 'f64d26fce002019f390b4f9f37c8edf965c362c5':
Remove a bad heuristic when determining click location for accessibility.
2014-12-19 22:43:30 +00:00
Svet Ganov
f64d26fce0
am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
...
* commit 'e130d6c14ae2d4a6f703ef452a7e5741d84936a0':
Remove a bad heuristic when determining click location for accessibility.
2014-12-19 22:36:56 +00:00
Svet Ganov
257ffbda60
Remove a bad heuristic when determining click location for accessibility.
...
As a bride-gap solution to click on partially covered views in accessibility
mode we compute a point on the screen where to send a down/up event pair.
A heuristic we used was that if the action target is covered by a view that
that has a touch listener we consider the target obscured by the one with
the listener. However, this generates false positives, for example the target
is covered by a view that observers touches for scrolling but not clicking.
bug:18782023
Change-Id: I31ff34011d45667f1eddda47373ec00e4a23dbf6
2014-12-19 11:59:21 -08:00
Alan Viverette
33e3cdab5b
Allow theme attributes in <include> tag, fix <tag> context
...
BUG: 17658979
Change-Id: I79a55ee53bff5ea6efb04997973a9aa810ff0950
2014-12-17 15:43:29 -08:00
Alan Viverette
acf874112a
Merge "Revert "Allow theme attributes in <include> tag, fix <tag> context""
2014-12-17 18:56:50 +00:00
Alan Viverette
a9783bffcc
Revert "Allow theme attributes in <include> tag, fix <tag> context"
...
This reverts commit 866180198a
2014-12-17 18:56:32 +00:00
Kris Giesing
8b6216d314
Fix minor spelling and grammar errors in public JavaDoc
...
b/18777215
Change-Id: I2403db4fb94144f0a71243c6b74076482defc9a4
2014-12-16 17:23:15 -08:00
Alan Viverette
b910bd7615
Merge "Allow theme attributes in <include> tag, fix <tag> context"
2014-12-16 18:01:26 +00:00
Alan Viverette
866180198a
Allow theme attributes in <include> tag, fix <tag> context
...
BUG: 17658979
Change-Id: I1896ef88ee850f665c7cbbec522e1942897f91e9
2014-12-15 16:58:19 -08:00
Alan Viverette
3224f3530c
Merge "Clean up ViewStub inflation to ensure it has resources"
2014-12-15 23:18:14 +00:00
Alan Viverette
9ecb73c7d8
Don't force hardware acceleration for services on low-end GFX
...
BUG: 18732678
Change-Id: I136135a91296de3e7d4c089b61019a5395de4a5b
2014-12-15 13:40:28 -08:00
Alan Viverette
39a72dd207
Clean up ViewStub inflation to ensure it has resources
...
BUG: 18642716
Change-Id: I52be9d379672ef143cd385c78a8e0744225de4ae
2014-12-15 11:23:57 -08:00
Alan Viverette
4ae0d9045f
am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
...
automerge: 878a5a6
2014-12-15 17:41:55 +00:00
Alan Viverette
878a5a6cd7
am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
...
* commit '2f11125a7186cc65713804c939a0e538538d9f35':
Give accessibility delegate the first pass at handling ACTION_CLICK
2014-12-15 17:38:25 +00:00
Alan Viverette
2f11125a71
am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
...
* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
Give accessibility delegate the first pass at handling ACTION_CLICK
2014-12-15 17:31:36 +00:00
Alan Viverette
9973643bfc
Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
2014-12-15 17:27:24 +00:00
Alan Viverette
cd305ae3ce
Give accessibility delegate the first pass at handling ACTION_CLICK
...
Delegation is broken for widgets, but this fixes the most egregious issue
where TextViews that are top-level list items weren't handling CLICK
actions correctly. This will still need work, since now the focus action
won't run, but it's an improvement.
BUG: 18736135
Change-Id: I808ef628198946cc87f13c53d6245cd162a1e517
2014-12-12 14:13:24 -08:00
Svet Ganov
103f52e1b2
am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
automerge: 1301446
2014-12-12 21:05:01 +00:00
Svet Ganov
1301446c01
am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
* commit 'e608644a9f0fa54a05379c171814569816145801':
Fix an edge case in computing click location in accessibility mode.
2014-12-12 21:02:24 +00:00
Svet Ganov
e608644a9f
am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
* commit '7486bc1f5a8156e9b586ebb9c32ced218e668652':
Fix an edge case in computing click location in accessibility mode.
2014-12-12 20:54:38 +00:00
Svet Ganov
7486bc1f5a
Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
2014-12-12 20:48:09 +00:00
Adam Powell
dd65a916c7
am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
automerge: 097e383
2014-12-12 18:57:35 +00:00
Adam Powell
097e3830cd
am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
* commit '746079e2ee516d1c7be62154992eda78e9f2ec28':
Have ViewGroups without a parent clip child visible rects to bounds
2014-12-12 18:49:37 +00:00
Adam Powell
746079e2ee
am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
Have ViewGroups without a parent clip child visible rects to bounds
2014-12-12 18:43:38 +00:00
Svet Ganov
9fc96c5371
Fix an edge case in computing click location in accessibility mode.
...
In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.
bug:18672945
Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
2014-12-11 22:33:48 -08:00
Adam Powell
35da41e6c3
Have ViewGroups without a parent clip child visible rects to bounds
...
getChildVisibleRect was enhanced to obey the official contracts for
clipping children and clip to padding. Unfortunately this meant that
ViewGroups with no parent have no way of checking if they will be
clipped to their own bounds and therefore should clip a child rect.
Treat orphaned view subtrees as entities that clip to the root view
bounds to preserve prior CTS guarantees.
Bug 18642973
Change-Id: I9fcbeb0e92cd6715cd9184183d36889614ed0bed
2014-12-10 18:59:34 -08:00
Nick Kralevich
7668e78601
resolved conflicts for merge of 3bae94d7 to master
...
Change-Id: I381539b1494447d62290c492f2550840fe0b559c
2014-12-10 11:03:40 -08:00
John Reck
af878b91f9
am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
...
* commit '389baa395125d5ae5aac3b9d2f98457dde09da26':
Fix issue with RNA destruction mid-animation
2014-12-09 23:49:22 +00:00
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
Svet Ganov
70acef7df4
am aad2ffe6: am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
...
* commit 'aad2ffe67af43fcfc8784b57c0fb9fe4687c9d69':
When accessibility on cannot click on a view covered by a HorizontalScrollView
2014-12-09 23:20:02 +00:00
Svet Ganov
0213ac7cda
am 2dbd133c: am a91256bc: am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
...
* commit '2dbd133c966a3b1acc51a9b645622667830c7e3e':
Clear clicked nodes from the accessibiliy cache.
2014-12-09 23:19:58 +00: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
