John Reck
65f2defdfc
resolve merge conflicts of cabf8a7 to master.
...
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
2014-11-07 11:29:08 -08:00
John Reck
cabf8a7064
am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev
...
* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
Fix wrong-thread issue
2014-11-07 18:48:43 +00:00
John Reck
4b19b7aaff
Merge "Fix wrong-thread issue" into lmp-mr1-dev
2014-11-07 18:34:55 +00:00
John Reck
12f5e34332
Fix wrong-thread issue
...
Bug: 18259560
Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
2014-11-07 10:31:53 -08:00
Winson Chung
c5f9ec3e27
am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
...
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
Adding bounce animation for affiliated tasks. (Bug 16656169)
2014-11-07 04:17:02 +00:00
Winson Chung
675a0b6bc9
am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
...
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
Adding bounce animation for affiliated tasks. (Bug 16656169)
2014-11-07 01:45:11 +00:00
Winson Chung
3ed9f2f903
Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
2014-11-07 01:30:20 +00:00
Justin Koh
402a360111
am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
...
* commit '4ca342cdba6fb2637415cfeb6e579cc662763daf':
Hide Surface#lockHardwareCanvas DO NOT MERGE
2014-11-07 00:05:54 +00:00
Winson Chung
044d52934e
Adding bounce animation for affiliated tasks. (Bug 16656169)
...
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
2014-11-06 14:02:35 -08:00
Justin Koh
2d42f48449
am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
...
* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
Hide Surface#lockHardwareCanvas DO NOT MERGE
2014-11-06 20:33:36 +00:00
Alan Viverette
8df94b5659
am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
...
* commit 'b6416716ad875a800c982dda77bafe910f9ed2d6':
Use default token instead of wrapped window manager
2014-11-05 05:03:59 +00:00
Alan Viverette
b6416716ad
am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
...
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
Use default token instead of wrapped window manager
2014-11-05 04:56:40 +00:00
Alan Viverette
9342b049b9
Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
2014-11-05 04:44:22 +00:00
Alan Viverette
838b7b6d05
am e48b397f: am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
...
* commit 'e48b397f93fb7ed4b7520d72368c2b4472f7cf5f':
Fix hasSurfaceInsets check when creating hardware renderer
2014-11-05 04:18:26 +00:00
Alan Viverette
a47e3e0572
am 69eb010b: am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
...
* commit '69eb010b1e2bc002b020b2722cc42447383bb5d3':
Abort accessibility node prefetch if parent node is null
2014-11-05 04:18:16 +00:00
Alan Viverette
e48b397f93
am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
...
* commit '405165b6cd749d0281bb1daa13bdf0a8f38112d9':
Fix hasSurfaceInsets check when creating hardware renderer
2014-11-05 04:06:21 +00:00
Alan Viverette
69eb010b1e
am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
...
* commit 'a77e349a3609833c55ee3b8b80fc5eef5fac4f1a':
Abort accessibility node prefetch if parent node is null
2014-11-05 04:05:58 +00:00
Alan Viverette
a446195b0d
Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
2014-11-05 02:09:30 +00:00
Alan Viverette
9c95264e84
Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
2014-11-05 01:41:28 +00:00
Alan Viverette
d2fa514391
Use default token instead of wrapped window manager
...
BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
2014-11-04 17:40:29 -08:00
Alan Viverette
2cd23e6b9d
Fix hasSurfaceInsets check when creating hardware renderer
...
BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521
2014-11-04 17:04:02 -08:00
Alan Viverette
84feea1185
Abort accessibility node prefetch if parent node is null
...
BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c
2014-11-04 15:59:55 -08:00
Tom Hudson
a5545d24c7
Merge "Remove status return from all uirenderer::Renderer functions"
2014-11-04 21:05:29 +00:00
Tom Hudson
107843de45
Remove status return from all uirenderer::Renderer functions
...
This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.
This is part of a series of CLs to refactor the Graphics JNI bindings.
BUG:15672762
R=djsollen@google.com ,ccraik@google.com
Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
2014-11-04 15:49:44 -05:00
Alan Viverette
12a72ada52
am 954f2567: am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
...
* commit '954f2567f90f1fa8b3d3d7d0c426ebd35494e182':
Pass surface insets from window attributes rather than params
2014-11-04 19:45:08 +00:00
Alan Viverette
954f2567f9
am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
...
* commit '3fff156e13341b0bf818f83d2bb0e9404285dd0c':
Pass surface insets from window attributes rather than params
2014-11-04 19:40:08 +00:00
Alan Viverette
93cad8c4d4
Pass surface insets from window attributes rather than params
...
Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.
BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
2014-11-04 11:27:19 -08:00
Justin Koh
7c1ad0cac6
Hide Surface#lockHardwareCanvas DO NOT MERGE
...
Hide this for now, will be public in a later release.
Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
2014-11-04 11:26:14 -08:00
John Reck
d0f91ebaef
am 43973c9d: am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480
...
* commit '43973c9d732d74dec12e796fb40ae285c1687d6a':
Fix cancel crash
2014-11-03 18:41:39 +00:00
John Reck
43973c9d73
am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev
...
automerge: 9280480
* commit '928048040cb5cd205ff5e74f9393dca2371c519a':
Fix cancel crash
2014-11-03 18:32:20 +00:00
John Reck
1787b4ea43
Merge "Fix cancel crash" into lmp-mr1-dev
2014-11-03 18:27:41 +00:00
John Reck
55b46eff39
Fix cancel crash
...
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
2014-11-03 10:00:33 -08:00
Adrian Roos
017c8dc878
am 1814f14c: am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev automerge: fcad9e1
...
* commit '1814f14c7d2ddfb0ccf0c8283bc7638059fc9af8':
Fix colored status bar panning issues
2014-11-03 15:53:57 +00:00
Adrian Roos
1814f14c7d
am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev
...
automerge: fcad9e1
* commit 'fcad9e17413da20db95a2cccbfc8641d2f30a4e6':
Fix colored status bar panning issues
2014-11-03 15:48:21 +00:00
Adrian Roos
808fe6f99f
Merge "Fix colored status bar panning issues" into lmp-mr1-dev
2014-11-03 15:44:08 +00:00
Svetoslav
e7d267e3d8
am eaaa38ae: am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev automerge: 97fcd2b
...
* commit 'eaaa38aea09e82fc557ebf0dd7fd02acfbfa1d59':
Adding APIs to enable apps to influence accessibility traversal.
2014-10-31 20:04:14 +00:00
Svetoslav
eaaa38aea0
am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev
...
automerge: 97fcd2b
* commit '97fcd2b5d15ed01b1ee27a30132e95b4733793cf':
Adding APIs to enable apps to influence accessibility traversal.
2014-10-31 19:58:57 +00:00
Svetoslav
b1ecf0d776
Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev
2014-10-31 19:53:32 +00:00
Alan Viverette
7bec21e627
am 1dfcd0cc: am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev
...
* commit '1dfcd0cc96d0cf50d81fe71101389a30e2bdbf2c':
Fix inset check in ThreadedRenderer
2014-10-31 00:43:33 +00:00
Alan Viverette
1dfcd0cc96
am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev
...
* commit 'e1f9f2311035177a91dd568c7ec9a821a76b9e24':
Fix inset check in ThreadedRenderer
2014-10-31 00:38:39 +00:00
Craig Mautner
585b0c3dc1
am 6a80527f: am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
...
* commit '6a80527f617e603b3c4931ce88c7804d570de501':
Add enter-animation-done callback for system windows
2014-10-31 00:37:01 +00:00
Craig Mautner
6a80527f61
am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
...
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
Add enter-animation-done callback for system windows
2014-10-31 00:29:52 +00:00
Alan Viverette
5d53065849
am 349e93ea: am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
...
* commit '349e93ea651b9153b7f7127c4f489a11df51b3aa':
Show scroll indicators in AlertDialog
2014-10-31 00:25:28 +00:00
Alan Viverette
349e93ea65
am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
...
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
Show scroll indicators in AlertDialog
2014-10-31 00:14:38 +00:00
Alan Viverette
14d3b42d5a
am c2663dfd: am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev
...
* commit 'c2663dfdab293c233e230f637b8aaf4bc79bf8d0':
Update drawable state after updating tint list
2014-10-31 00:01:33 +00:00
Alan Viverette
9b0ac44b41
am b50a6f39: am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
...
* commit 'b50a6f39ca8bafee342852de50029077be47334f':
Add setters for window elevation and clipToOutline properties
2014-10-31 00:01:21 +00:00
Alan Viverette
d99cbd96a6
am aff329f8: am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev
...
* commit 'aff329f867ef06f8caf86b60da2a14e7cec2f2bb':
Ensure accessibility focus rect is drawn correctly
2014-10-31 00:01:16 +00:00
Alan Viverette
843f1c1926
am 136974c0: am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev
...
* commit '136974c0668b05e9951f6f8c748d6cc42633eb39':
Create translucent hardware renderer if surface insets are non-zero
2014-10-31 00:01:11 +00:00
Svetoslav
6c70290ff0
Adding APIs to enable apps to influence accessibility traversal.
...
Accessibility focus is a token that can be put on any view and is
entirely controlled by accessibility services which decide whether
to put accessibility focus on a given view and what the traversal
strategy is.
Currently accessibility service use the view tree structure for
traversal which does not always reflect the logical order and the
user experience is sub-optimal. In such cases apps should be able
to influence how they are traversed for accessibility.
This change adds the notion of an accessibilty traversal order.
If a view has next in the traversal, an accessibility service has
to traverse the content of this view before traversing the content
next one.
This change will enable accessibility service to move away from
using the view tree and use spatial location of the content while
app developers can also influence the treversal order.
bug:17319923
Change-Id: Ib67ae4577f30b2c96575c71538dc1afdea08bfd3
2014-10-30 16:55:53 -07:00
Alan Viverette
c2663dfdab
am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev
...
* commit '0ab3e1df1de76f54296eefb1df05664950da8d2b':
Update drawable state after updating tint list
2014-10-30 23:44:49 +00:00