1464 Commits

Author SHA1 Message Date
Narayan Kamath
cdc095ae48 am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '7be33110ea3e1a032ee3aa7c50f1dedf52fcab25':
  AArch64: Use long for pointers in graphics/Interpolator
2014-01-29 12:18:31 +00:00
Narayan Kamath
e4fc5c17c0 am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
  AArch64: Use long for pointers in SurfaceTexture
2014-01-29 12:18:27 +00:00
Narayan Kamath
7be33110ea am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit 'd4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3':
  AArch64: Use long for pointers in graphics/Interpolator
2014-01-29 04:14:48 -08:00
Narayan Kamath
74db9ddb34 am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '887b1ca87941095797a246b2d68ec2626a7cfc43':
  AArch64: Use long for pointers in SurfaceTexture
2014-01-29 04:14:44 -08:00
Narayan Kamath
d4ccffd3ba Merge "AArch64: Use long for pointers in graphics/Interpolator" 2014-01-29 12:12:27 +00:00
Narayan Kamath
887b1ca879 Merge "AArch64: Use long for pointers in SurfaceTexture" 2014-01-29 12:12:17 +00:00
Narayan Kamath
be674bf688 am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '23abbfbb814501b825edc056027270f03f39506b':
  AArch64: Use long for pointers in graphics/Camera
2014-01-28 19:18:45 +00:00
Narayan Kamath
7ae1726d0b am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit 'aa9ba887371e875ffbde49f43fa12bb5f123425b':
  AArch64: Make graphics classes 64-bit compatible
2014-01-28 19:18:40 +00:00
Narayan Kamath
23abbfbb81 am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"
* commit '154614abbcc819c265bfb79b2626fcee66333ac2':
  AArch64: Use long for pointers in graphics/Camera
2014-01-28 11:15:57 -08:00
Narayan Kamath
aa9ba88737 am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"
* commit '6e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb':
  AArch64: Make graphics classes 64-bit compatible
2014-01-28 11:15:47 -08:00
Ashok Bhat
5753b45516 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)

Change-Id: Ic05ebf2051a225a1638a43f476bab6176c0b5c38
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-28 17:53:30 +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
Narayan Kamath
6b81bfd10f am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit 'caea42fd2daabedaed383105e10c11150f52b7df':
  AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 07:35:16 -08:00
Narayan Kamath
03e8be757d am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '8796ab7f22d3e9f5b85571e8851851c023416f96':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 07:35:06 -08:00
Narayan Kamath
caea42fd2d am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure"
* commit '98002dfb60a20caf62d6682659547c042a4a3342':
  AArch64: Use long for pointers in graphics/PathMeasure
2014-01-16 07:31:58 -08:00
Narayan Kamath
8796ab7f22 am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit 'bb35356dc05632664e1d65588c9d0570c185280b':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
2014-01-16 07:31:53 -08:00
Ashok Bhat
a2f9042f4e AArch64: Use long for pointers in graphics/Interpolator
For storing pointers, long is used in
android/graphics/Interpolator 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)

Change-Id: I1e181476a4fe5273ff190cf34c4a7487aa1aecf4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-16 13:23:53 +00:00
Ashok Bhat
72aa313ff4 AArch64: Use long for pointers in SurfaceTexture
Long is used in SurfaceTexture class to store
pointers 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)

Change-Id: I771aa62c42bc865e644c63fd48f309782dd03e73
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-16 12:55:13 +00:00
Narayan Kamath
98002dfb60 Merge "AArch64: Use long for pointers in graphics/PathMeasure" 2014-01-16 12:12:11 +00:00
Ashok Bhat
b091d47a2e AArch64: Use long for pointers in BitmapRegionDecoder
For storing pointers, long is used in BitmapRegionDecoder
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)

In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.

Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:23:22 +00:00
Ashok Bhat
dcaf5593dd AArch64: Use long for pointers in Movie class
For storing pointers, long is used in Movie 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)

Change-Id: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:22:56 +00:00
Ashok Bhat
0c10cc6052 AArch64: Use long for pointers in graphics/PathMeasure
For storing pointers, long is used in
android/graphics/PathMeasure 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)

Change-Id: I4599a9d5f7dcf9c39838db96d9033059114d3a49
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-13 14:50:50 +00:00
Stephen Hines
57cf560719 DO NOT MERGE - Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
2013-12-18 16:24:21 -08:00
The Android Open Source Project
ebcb32f58a Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
2013-12-05 13:10:46 -08:00
Katie McCormick
37e4c405a6 am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '484b57a5655f28967e0062f578f38535dff52323':
  Doc updates: Javadoc fixes
2013-11-26 14:00:33 -08:00
Katie McCormick
484b57a565 am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
  Doc updates: Javadoc fixes
2013-11-26 21:58:18 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
2013-11-26 13:52:48 -08:00
Jason Sams
1ccc6633bf am 9e6d8f04: Merge "Adding operations to reflected Renderscript class"
* commit '9e6d8f04940fd710ae858ff7ee4df43eb03ea85e':
  Adding operations to reflected Renderscript class
2013-11-26 12:32:22 -08:00
Jason Sams
9e6d8f0494 Merge "Adding operations to reflected Renderscript class" 2013-11-26 20:23:44 +00:00
Svetoslav
134631b907 am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-dev
* commit '90242fe5581c8f665c09337a0971a7c3fc908f7c':
  Switch to the new Skia PDF generation APIs.
2013-11-07 16:22:22 -08:00
Svetoslav
90242fe558 Merge "Switch to the new Skia PDF generation APIs." into klp-dev 2013-11-08 00:20:10 +00:00
Svetoslav
35aacf2eb3 Switch to the new Skia PDF generation APIs.
The new Skia PDF generation APIs are a small extension to
the code that converts drawing commands to PDF (SkPDFDevice)
and this new functionality is exposed via new APIs. This
change switches to using these new APIs allowing us to
capitalize on the new perspective support for PDF
generation.

bug:11561776

Change-Id: Ief61f7ff6a5a22c27d3acbe99a48910cb679f594
2013-11-07 14:15:19 -08:00
Fabrice Di Meglio
e34c477060 am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
* commit '435c0ee10af132937dc0a22c39380624e6efd5ab':
  Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
2013-11-07 11:21:03 -08:00
Fabrice Di Meglio
435c0ee10a Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev 2013-11-07 19:18:00 +00:00
Newton Allen
badb59cd5d am 47feee53: Merge "Fix some documentation typos." into klp-docs
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
  Fix some documentation typos.
2013-11-07 05:19:12 +00:00
Fabrice Di Meglio
f7a93ef384 Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
- enforce the Drawable boolean getPadding(Rect) contract for NinePatchDrawable
and DrawableContainer.

- as NinePatchDrawable was not enforcing it, the consequence was that the
mUserPaddingLeftInitial / mUserPaddingRitghInitial were reset to "0" (even
if they got the correct value before the reset).

Change-Id: I1efe7fad5f89c0ca47f90189f6d89940e0e9c6ae
2013-11-06 15:32:01 -08:00
Chris Craik
47742d4bb0 Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev 2013-11-06 23:23:56 +00:00
Chris Craik
222f2ad294 Fix NPE with inPurgeable Bitmaps in getAllocationByteCount
bug:11556330
Change-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe
2013-11-06 14:01:28 -08:00
John Spurlock
9d383ece52 Merge "Fix recent regression in DrawableContainer." into klp-dev 2013-11-06 02:29:20 +00:00
Adam Koch
57c9886d4b Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.
Bug: 6064760

Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e
(cherry picked from commit e1693df494dbdedfb5eac56bf59f86afc893b778)
2013-11-06 01:18:05 +00:00
Adam Koch
be0b05a028 Merge "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760" into klp-dev 2013-11-06 01:13:44 +00:00
John Spurlock
f68bb66c6e Fix recent regression in DrawableContainer.
Ensure optical insets are never null.

Bug:11537082
Change-Id: Ib75be83909fac612ae947f501835285cd8a79862
2013-11-05 19:15:41 -05:00
Adam Koch
e1693df494 Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.
Bug: 6064760

Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e
2013-11-05 16:00:09 -05:00
Fabrice Di Meglio
f48bcd5b68 Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev 2013-11-05 00:46:19 +00:00
Newton Allen
ff236f5fc1 Fix some documentation typos.
Change-Id: I0360d468d54d970c87f313e24e50965245206f28
(cherry picked from commit c502744f2ddcc80a34f5197b5d2c0d701c7d6e71)
2013-11-01 02:38:01 +00:00
Svetoslav Ganov
78da147d42 Update the PdfDocument docs with unsupported operations.
The PDF generating canvas we use does not yet support all
drawing operations. This change adds docs which operations
are not yet supported.

Change-Id: I8d5ee8c1e2a473ba783b5e62f23ab90a54bbf106
(cherry picked from commit 8db45b844b5482cf61839404c0f6847e053de817)
2013-10-31 23:05:55 +00:00
Svetoslav Ganov
8db45b844b Update the PdfDocument docs with unsupported operations.
The PDF generating canvas we use does not yet support all
drawing operations. This change adds docs which operations
are not yet supported.

Change-Id: I8d5ee8c1e2a473ba783b5e62f23ab90a54bbf106
2013-10-31 08:10:12 -07:00
Matthieu Delahaye
6a5875cf96 Adding operations to reflected Renderscript class
Renderscript expose its native types back to the Android
system through a set of classes defined within the renderscript
package. These classes provides no easy mean to manipulate
data they represent. It would be convinient to be able to manipulate
the data stored within an allocation via these classes directly
instead of having to marshall them into native Java objects.

This commit adds such operations to the existing exposed vector types.

Change-Id: I1845df1368a82f0d39b36416c83938c7160f6a3f
2013-10-23 16:02:03 -05:00
Fabrice Di Meglio
600d7dd1c6 Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
Background Drawable padding was not taken into account in RTL Locales

- make sure the Drawables are resolved before resolving padding
- during padding resolution take care about background padding

Change-Id: Ib0c722adf5341ab4fa2182a0d0ac2ca639e85cfc
2013-10-18 11:26:48 -07:00
Eino-Ville Talvala
cd92588528 DO NOT MERGE: Hide new camera API.
Not yet ready.

Bug: 11141002

Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
2013-10-11 19:26:08 +00:00