Commit Graph

5105 Commits

Author SHA1 Message Date
Michael Wright
8a5dbac349 Remove Japanese button swap
Bug: 12923922
Change-Id: I4960d8189e751514a595823d7ed9b273e3ff8eb8
2014-02-14 13:20:58 -08:00
Narayan Kamath
ee904d4d3e am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '6795e9c783242b31188d76c5186dfe0751f1731a':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 13:23:46 +00:00
Narayan Kamath
7a66d8ea7c am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 13:17:13 +00:00
Alan Viverette
7d57765db9 Merge "Add selection properties to CollectionInfo, CollectionItemInfo" 2014-02-14 01:15:04 +00:00
Guang Zhu
831663d8fa Merge "reduce error logs from disconnected AccessibilityNodeInfo's" 2014-02-13 18:45:25 +00:00
Guang Zhu
32569caa6a reduce error logs from disconnected AccessibilityNodeInfo's
ChromeView generates a large amount of such logs; while the real
root cause is being fixed, reduce the verbosity so other
interesting logs won't get overwritten.

Bug: 10871032
Change-Id: If42116671062d7b2cc2a13384424575da499c493
2014-02-12 17:27:15 -08:00
Alan Viverette
76769ae02e Add selection properties to CollectionInfo, CollectionItemInfo
BUG: 12552541
Change-Id: Iae10abc02eeffea7c7fcb25020b343181e1e3482
2014-02-12 16:38:10 -08:00
ztenghui
b67ca78d97 Merge "Fix one flag setting bug" 2014-02-13 00:16:37 +00:00
ztenghui
b9122c672e Fix one flag setting bug
TODO: encapsulate the bit operations into functions.

Change-Id: I68ada214c080ac54ea43c327684c87dacef85491
2014-02-12 14:32:59 -08:00
Chris Craik
c70c723cf8 Merge "Avoid crash if layer is destroyed after GLRenderer" 2014-02-12 21:52:42 +00:00
Chris Craik
637314d15c Avoid crash if layer is destroyed after GLRenderer
bug:12988766
Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
2014-02-12 13:45:52 -08:00
Alan Viverette
09591e89e4 Merge "Add support for assigning keyed View tags via XML" 2014-02-12 20:46:38 +00:00
Alan Viverette
cdd2eddcb2 Set properties for pooled CollectionItemInfo, CollectionInfo
BUG: 12978446
Change-Id: I64a366952090ab663ffef43a1d210528805e113c
2014-02-12 11:28:33 -08:00
Derek Sollenberger
e889298cd6 Refactor setting an SkPaint onto a hwui Layer.
This CL removes the unecessary JNI call to set the colorFilter on
a layer.

Change-Id: I9e088f888938d4315745aa618334bfdb9e61343a
2014-02-12 11:26:06 -05:00
Alan Viverette
451a3417e9 Add support for assigning keyed View tags via XML
BUG: 12768823
Change-Id: Ic55c88894dc153c0af0805e403ad8e40d13abcd2
2014-02-11 18:08:46 -08:00
John Reck
fc53ef2779 Implement missing safelyRun() on ThreadedRenderer
Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
2014-02-11 10:40:25 -08:00
John Reck
04fc583c3d Refactor HardwareLayer
Defer all the things!
 Groundwork to allow hardware layers to work in a renderthread world

Change-Id: Ib3aa47525f393083621254a743dbaa6352f933bd
2014-02-10 20:55:39 -08:00
Derek Sollenberger
eef1be1d83 Merge "Removing SkiaColorFilter and inspecting the native object directly." 2014-02-10 19:19:07 +00:00
Chris Craik
b67a7bf27b Add shadow casting / global perspective APIs, hidden for now.
Global perspective isn't yet hooked up in rendering.

Change-Id: I64ad272ea5dc523505260ce114f0a6bebdcfe9dc
2014-02-07 16:02:51 -08:00
Derek Sollenberger
76d3a1b8d0 Removing SkiaColorFilter and inspecting the native object directly.
bug: 10650594
Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
2014-02-07 17:06:14 -05:00
ztenghui
fad4593a3c Add the clipToOutline by just using the clipPathOp
Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
2014-02-07 13:36:57 -08:00
Chris Craik
27bfb24518 Merge "Rework and clean up DisplayList projection" 2014-02-07 18:47:57 +00:00
Chris Craik
1df26446b7 Rework and clean up DisplayList projection
Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.

Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).

Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
2014-02-06 16:07:37 -08:00
Adam Powell
6250c59e0d Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 2014-02-06 22:41:14 +00:00
John Reck
593b19a49e Remove overdraw counter
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
2014-02-06 11:26:23 -08:00
Ashok Bhat
a3850d8f8f AArch64: Use long for pointers in SurfaceSession class
For storing pointers, long is used in SurfaceSession class,
as native pointers can be 64-bit.

Change-Id: I1535a488dfffaddd20e3beac57e558035d715cbf
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-06 16:57:49 +00:00
Alan Viverette
d5154ec2bc Add prototype for borderless touch feedback drawable
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
2014-02-05 17:53:33 -08:00
Alan Viverette
dc9125880c Merge "Temporary fix for background invalidation" 2014-02-05 22:16:10 +00:00
Alan Viverette
e6875f1575 Temporary fix for background invalidation
Not a complete solution, since we could be more efficient, but enough
to have both background display lists and proper invalidation.

Change-Id: I0216a104948c0930760275bb2b98318b0a4487e7
2014-02-05 14:05:17 -08:00
Adam Powell
46e38fd9ab Refactoring of fitSystemWindows to applyWindowInsets for views
Applying insets is now handled by:

* WindowInsets class - Encapsulate system insets and local decor
  insets into a single object, written specifically so that new inset
  categories may be added later. Apps cannot construct their own
  WindowInsets, only clone with optional modifications. This is to
  prevent losing data in the event of new insets added in the future.

* onApplyWindowInsets - Actually perform the application of insets.

* OnApplyWindowInsetsListener - Allow an app to use a separate
  Listener object to apply insets to a View. This allows for things
  like support lib integration in custom views written for older
  versions where the verifier would otherwise complain about the use
  of the new WindowInsets class as a method parameter. It also allows
  for applying insets in a custom way without writing a custom view.

* dispatchApplyWindowInsets - Dispatch the call to self and children
  in turn, if applicable. An OnApplyWindowInsetsListener will override
  the behavior of the view's default onApplyWindowInsets method; a
  listener wishing to call down to the 'superclass' implementation as
  part of its own operation should call view.onApplyWindowInsets. App
  code should generally not override this method and instead override
  onApplyWindowInsets or provide a listener.

Compatibility support with the existing fitSystemWindows method has
been provided in both directions: for code that previously called
fitSystemWindows on arbitrary views and also for code that overrode
the fitSystemWindows method in custom views. A view that supports the
newer onApplyWindowInsets mechanism should not mix that behavior with
other calls to fitSystemWindows or vice versa. Support lib-style code
should take care to consistently use one mechanism or the other at
runtime.

Change-Id: Ie88b96e0382beb5d3c3f6cd013f7043acbc0a105
2014-02-04 16:52:22 -08:00
George Mount
0a778eda69 Cross-Activity Scene transition API.
First pass at API for cross-Activity Scene transitions.
Remaining work:
  Transition back
  Automatically capture hero element info
  Transfer of surface texture to synchronize between Activities
  Possibly use scene names to indicate preferred transition

Change-Id: I59d07de1fae694a46b92b1c82525daa301ec1377
2014-02-04 16:18:43 -08:00
Alan Viverette
143b46d50c Check for null display list
BUG: 12764584
Change-Id: I071aa0d9bc4f4ac353a5d0f534cf7c44964d4bf0
2014-02-04 14:19:06 -08:00
Alan Viverette
9f244efbfa Merge "Make background projection a property of View" 2014-02-04 22:05:26 +00:00
Alan Viverette
4085aac583 Make background projection a property of View
BUG: 12764584
Change-Id: Id80afd6d26c814d3fd551f6690d4a88c441b0b9f
2014-02-04 11:17:32 -08:00
Alan Viverette
8eea3ea559 Add APIs for obtaining themed Drawable from Theme, Context
BUG: 12611005
Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016
2014-02-03 18:42:24 -08:00
Andy McFadden
40b9ef1e2d Remove setFlags()
Remove setFlags(), which doesn't seem to be used, and make the flag
declarations private.  The flags can be set with hide(), show(), and
setOpaque().

Change-Id: I2bdff0881d9397b0c4455f6663c2a1e8084df719
2014-02-03 07:27:11 -08:00
Alan Viverette
fe0ea8c21f Merge "Allow specification of View theme override as a theme attribute" 2014-01-31 21:05:24 +00:00
Chris Craik
1d89563ff8 Merge "Add initial hidden outline APIs" 2014-01-31 18:56:41 +00:00
George Mount
d085625976 Merge "Add PathInterpolator to interpolate along a Path." 2014-01-31 00:53:20 +00:00
George Mount
6e5f045ddf Add PathInterpolator to interpolate along a Path.
Change-Id: I45b361ef8edd49b5e22d66ba9e25600065e0d5e7
2014-01-30 16:50:15 -08:00
Chris Craik
a2fe7affd3 Add initial hidden outline APIs
Background drawable outline usage and drawable outline calculation
still to come.

Change-Id: I8c7539f1638f86e1f8eb11f4fe49f705f61d58ba
2014-01-30 16:04:16 -08:00
Andy McFadden
acdbb9a9e1 Merge "Allow "opaque" flag to be updated" 2014-01-30 21:41:38 +00:00
Andy McFadden
314405bf89 Allow "opaque" flag to be updated
Added a setOpaque() call and a bunch of comments.

Bug 12387406

Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
2014-01-29 17:38:10 -08:00
Chris Craik
0e7eb954f1 Fix build breakage
Change-Id: I65ab3cb691935db23b7a1f600e421fb5d8e850cd
2014-01-29 15:30:50 -08:00
Chris Craik
6657a6c539 Update reordering method names, and make 3d reordering API public
IsContainedVolume -> hasIsolatedZVolume conveys that this affects Z
ordering of views

ProjectToContainedBackground -> ProjectBackwards, since it ended up
using its own projection target, separate from the 3d volume bit

Change-Id: Ia2cde838cc4da134366fe6ff623290fbd65e50c3
2014-01-29 13:55:39 -08:00
Svetoslav Ganov
c0877962b3 Adding the print and accessibility pacelables to framework.aidl
1. There are a few parcelable classes related to printing and accessibility
   which are public but not added in the framework.aidl list so third parties
   cannot write aidl interfaces that pass these classes. As these classes
   are public it is resonable for devepers to be able to pass them between
   processes.

Change-Id: I85da1de5198902b74f19d23e3fe16b45b4a11051
2014-01-28 23:00:14 +00:00
Narayan Kamath
583b7b1671 am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '39a789bf6efd5c3478a442e60e896cae371fd04c':
  AArch64: Make graphics classes 64-bit compatible
2014-01-28 19:26:29 +00:00
Ashok Bhat
a0398430fc AArch64: Make graphics classes 64-bit compatible
Changes in this patch include

[x] Long is used to store native pointers as they can
    be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
    yet. Specifically mAtlasMap member has to be converted
    to hold native pointer using long. Added a TODO to
    AssetAtlasManager.java to indicate the change required.

Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-28 17:40:38 +00:00
Ashok Bhat
36bef0bf30 AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
    be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
    yet. Specifically mAtlasMap member has to be converted
    to hold native pointer using long. Added a TODO to
    AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
2014-01-28 10:02:43 +00:00
John Reck
4f02bf4eef Native-side proxy
Remove RemoteGLRenderer
 Remove reflection-based control

Change-Id: If17c2bbb61c7141986d88c4763def77ed1074985
2014-01-27 16:40:39 -08:00