Commit Graph

3138 Commits

Author SHA1 Message Date
Lucas Dupin
db83feae54 Merge "Add transfer mode support to ColorDrawable" into oc-dev am: eedceb5721
am: a17c58ff59

Change-Id: Ied2dd786e7a31f53c685b920e119bd127f9d9f82
2017-04-21 20:04:00 +00:00
TreeHugger Robot
eedceb5721 Merge "Add transfer mode support to ColorDrawable" into oc-dev 2017-04-21 19:29:07 +00:00
Seigo Nonaka
a691442ce0 Merge "Cache the Typeface based on the FontRequest." into oc-dev am: 5b96e55d90
am: a121eabf99

Change-Id: Ib4e0860910b498cc8effb5b62b5642d0d9bbd39d
2017-04-21 18:18:19 +00:00
Seigo Nonaka
daa8dfc690 Cache the Typeface based on the FontRequest.
Bug: 37471729
Test: FontsContractE2ETest
Change-Id: Ifb1bd2b50077471404f5f1dffc01e7697d7042e6
2017-04-21 09:11:10 -07:00
Hyunyoung Song
2d63567164 Merge "Support fraction type for inset* for InsetDrawable. b/36024318" into oc-dev am: ab7a2879eb
am: a457ce7ce8

Change-Id: I9dab39e4f2ee254925bcf2bdba592e8769016cc9
2017-04-21 15:38:14 +00:00
TreeHugger Robot
ab7a2879eb Merge "Support fraction type for inset* for InsetDrawable. b/36024318" into oc-dev 2017-04-21 15:14:27 +00:00
Clara Bayarri
506847aa92 Merge "Update Typeface callback docs about error codes" into oc-dev am: 337be5a12f
am: 5d2334fb7c

Change-Id: Ib85820fd4e743102b6697ecb9ac92b5e45aa9c05
2017-04-21 09:55:49 +00:00
TreeHugger Robot
337be5a12f Merge "Update Typeface callback docs about error codes" into oc-dev 2017-04-21 09:44:53 +00:00
Hyunyoung Song
d0dfe3008d Support fraction type for inset* for InsetDrawable.
b/36024318

Test: manually tested on default icons.
Test: $ runtest --path=cts/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java

adb  shell am instrument -e class 'android.graphics.drawable.cts.InsetDrawableTest' -w 'android.graphics.cts/android.support.test.runner.AndroidJUnitRunner'

android.graphics.drawable.cts.InsetDrawableTest:........................

Time: 0.132

OK (26 tests)

Change-Id: Ie8d24680b6884e65017f07723a371120f5ae610c
2017-04-20 16:23:40 -07:00
Lucas Dupin
b27b47df6b Add transfer mode support to ColorDrawable
Test: runtest --path cts/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java
Change-Id: Ice87f248e307710315304fc191cb58ee7142e525
2017-04-20 13:57:01 -07:00
Romain Guy
fdd18cf325 Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev am: e53b00c6d1
am: 09071f9bdf

Change-Id: I7229520e46f2ee3f0f49f0971b761b2a4a4358c1
2017-04-20 13:46:24 +00:00
Chris Craik
3eccc9b7fe Merge "Fix compose shader child local matrix mutation" into oc-dev am: 611fae13df
am: 88677af970

Change-Id: I68729ff5415f329feeabb160c0308ecbe3d8fb3f
2017-04-20 13:21:35 +00:00
Seigo Nonaka
d6c8688ca7 Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev am: f3157e1692
am: 39b5ad8411

Change-Id: Ia159ba2bff5cc333e6945d05291002ab8669c612
2017-04-20 12:42:11 +00:00
Clara Bayarri
5706a1b12d Update Typeface callback docs about error codes
As requested by API council, mention that the provider may
return its own error codes within the positive int range.

Bug: 37084803
Test: none
Change-Id: Ia8ee99432cc5025a12d43049e327605095dd2b57
2017-04-20 12:02:57 +01:00
TreeHugger Robot
e53b00c6d1 Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev 2017-04-19 21:09:46 +00:00
TreeHugger Robot
611fae13df Merge "Fix compose shader child local matrix mutation" into oc-dev 2017-04-19 20:41:06 +00:00
TreeHugger Robot
f3157e1692 Merge "Add comment to Typeface.Builder about file descriptor." into oc-dev 2017-04-19 20:08:57 +00:00
Romain Guy
08587d45b1 Set the color space as nullptr on native bitmaps when sRGB is requested
This regression is a fallout from the recent API council feedback
fallout. The default color space used to be always set to null but
it's now the named SRGB instance. This change passes null to native
when the specified color space is known to be sRGB.

Bug: 37496760
Test: runtest managed-provisioning
Change-Id: Ie933c84e429a682a58ee253b57b77bd61b88ee5e
2017-04-19 11:58:05 -07:00
Chris Craik
f6b0e60bd0 Fix compose shader child local matrix mutation
Bug: 37495696
Test: cts-tradefed run singleCommand cts-dev --module CtsGraphicsTestCases --test android.graphics.cts.ComposeShaderTest

Adds back the verify step that discards a stale native ComposeShader if a child
changes.

Change-Id: I44f40c1edfdb7633994a69efb583cf28ee2c26b2
2017-04-19 10:57:25 -07:00
Romain Guy
b58a40d40f Merge "Change nullability of colorspace parameter" into oc-dev am: 944782fac2
am: 1c32d2cd98

Change-Id: I92853da836ce26801b9350cb1f65664e58e15d47
2017-04-18 23:42:41 +00:00
TreeHugger Robot
944782fac2 Merge "Change nullability of colorspace parameter" into oc-dev 2017-04-18 23:26:00 +00:00
Chris Craik
c8f8c6a7c7 Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev am: 0f9f0f90e7
am: 0d6ea6a1f5

Change-Id: I84496c4aeee4cccc73f5d17f909d91f6910f1d85
2017-04-18 22:30:04 +00:00
Romain Guy
1fa9d86ea4 Change nullability of colorspace parameter
Bug: 37323693
Test: android.graphics.cts.BitmapColorSpaceTest
Change-Id: I705ac18e5c64c028c2e8366a18ec4ef20f44a630
2017-04-18 14:06:49 -07:00
Chris Craik
8a6ad4a89d Re-hide shader mutation, remove colorfilter mutation
Bug: 36025103
Bug: 37327129
Test: boots, CtsGraphicsTestCases passes

Change-Id: I937f8ae26ed47b4811dc033ed91c257670fc3a39
2017-04-18 12:57:59 -07:00
Seigo Nonaka
83ba4f9a04 Add comment to Typeface.Builder about file descriptor.
Add comment to Typeface.Builder about the responsibility of closing
file descriptor.

Bug: 37082657
Test: N/A
Change-Id: Id33b15895d75ad6693f3ad6231f1ba0c2cec9f79
2017-04-17 19:33:00 -07:00
Romain Guy
6be819522d resolve merge conflicts of 2439e19d41 to master
Test: built locally
Change-Id: Idc922c7fa3306e6884b88c79e73f5375d8e65888
2017-04-17 12:31:09 -07:00
Romain Guy
5545518123 Properly decode colors spaces in BitmapRegionDecoder
Reusing a bitmap with BitmapRegionDecoder would preserve the
previous color space. This change also tweaks color space
matching to make sure we pick Display P3 with parameter d=0.039
or d=0.04045

Bug: 36905374
Test: CtsGraphicsTestCases
Change-Id: I4d2d66e5babebb0b5ce5cbdc7e8244177b4b7f9c
2017-04-15 21:41:22 -07:00
Seigo Nonaka
16caccbcd9 Merge "Fix boot loop issue on Android Wear." into oc-dev am: 5f9fde884b
am: f08388e8ea

Change-Id: I5c61dfb5166e4456f55ef79a122c8fc0b312ed86
2017-04-14 22:24:34 +00:00
TreeHugger Robot
5f9fde884b Merge "Fix boot loop issue on Android Wear." into oc-dev 2017-04-14 22:16:22 +00:00
Romain Guy
908370bb27 Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7
am: f713a1960e

Change-Id: Ie1d361e946cf68ba97352ef6946f9d82ed5b784b
2017-04-14 21:19:25 +00:00
Romain Guy
e9cbbea820 Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev am: 1eaab2db82
am: fd715c7fbe

Change-Id: I1b97afca9c46a6e2c1c33a9f68da49e43c039b46
2017-04-14 21:10:00 +00:00
Romain Guy
c99bcc69f7 Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev 2017-04-14 21:08:42 +00:00
Romain Guy
c6866a988a Merge "Fix API feedback on Color" into oc-dev am: 03758701fb
am: 7700c2b238

Change-Id: I64f6dcabfd1722475947be3b3e3cc636b724dbed
2017-04-14 20:57:07 +00:00
TreeHugger Robot
1eaab2db82 Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev 2017-04-14 20:53:26 +00:00
TreeHugger Robot
03758701fb Merge "Fix API feedback on Color" into oc-dev 2017-04-14 20:42:19 +00:00
Seigo Nonaka
24c6464663 Merge "Use provided style for fallback font selection" into oc-dev am: 43112fd26e
am: 83c52e0a40

Change-Id: Ia42f6a377c2617c8da9a84cb8bd7781326e464a1
2017-04-14 18:09:55 +00:00
Romain Guy
65d8ce4676 Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am: 4cae059bb9" into oc-dev-plus-aosp
am: e9277ebe4a

Change-Id: I187ec4ffcb2db909443e3c7286e1cdde7bc9193b
2017-04-14 17:29:55 +00:00
Romain Guy
95648b8a59 Add BitmapFactory.Options.inColorSpace
This allows applications to load bitmap in a preferred
target color space, similar to inPreferredConfig for
configurations.

This change also applies recent changes made to BitmapFactory
to BitmapRegionDecoder: support for outColorSpace, inColorSpace
and outConfig.

Bug: 32984164, 36905374
Test: CtsGraphicsTestCase (BitmapColorSpaceTest/BitmapRegionDecoderTest)
Change-Id: I4eded9190d1aa9c7f3033f9bb78a6854cc48a3ef
2017-04-14 10:14:27 -07:00
Romain Guy
b7c30edeb1 Merge "Range check transfer params in float domain" into oc-dev am: 819740cc73
am: 1f1667122a

Change-Id: I5240515f1dd5939227f90b8b2aaf59622af6bea7
2017-04-14 16:33:12 +00:00
Seigo Nonaka
659c9cfac3 Merge "Introduce setFallbackTypeface" into oc-dev am: 729a515e5e
am: 17452ee553

Change-Id: I66fe816727aae3fdf617c41796b25478090704fe
2017-04-14 15:31:25 +00:00
Seigo Nonaka
43112fd26e Merge "Use provided style for fallback font selection" into oc-dev 2017-04-14 15:13:15 +00:00
Romain Guy
7c42e16eb0 Clarify doc for Bitmap.createBitmap()
Bug: 37323693
Test: compiles
Change-Id: I8cf316cf4c67b69c47c67848c576af6399a0111f
2017-04-13 20:48:29 -07:00
Romain Guy
26ca96ecb8 Fix API feedback on Color
Bug: 37323188
Test: Color_ColorLongTest and ColorSpaceTest in CtsGraphicsTestCases
Change-Id: I1e52d3f63f95b9bdb4410938b727a87c45429aac
2017-04-13 20:40:46 -07:00
TreeHugger Robot
4cae059bb9 Merge "Add more doc to ColorSpace.getName()" into oc-dev 2017-04-14 03:10:16 +00:00
Seigo Nonaka
bf629ed080 Fix boot loop issue on Android Wear.
The boot loop was seen after I65e220aca823fd815a52437b11c8e6dc952de8e2
but only on Android Wear. On Android Wear, some font files are missing
but are listed in fonts.xml. Before that patch, we created a Typeface
object with an empty FontFamily even if there was no valid font entry
in font-family tag. However, after that patch, FontFamily stopped
creating native objects and holds a null pointer instead. As the
result, SIGSEGV happens.

The right fix is skipping Typeface creation if native code failed to
create the font family object.

Since Typeface.init cannot be called twice, this is hard to test
automatically.

Bug: 37328609
Bug: 37326002
Test: Boot succeeded even after removing CutiveMono.ttf from system.

Change-Id: I125de07343252784986d728c3bbaa46b24ace601
2017-04-13 18:58:36 -07:00
Seigo Nonaka
d154829cb1 Use provided style for fallback font selection
If the developer gives some weight/italic to the Typeface.Builder
the fallback used the metadata in the font file. We should use
provided data instead.

This CL also adjusts upper and lower limits on weight, from 100..900 to
1..1000

Bug: 37257745
Bug: 37251569
Test: android.graphics.cts.TypefaceTest passes
Change-Id: I7cf390d96b49afcce359928373698b0c9a9babd8
2017-04-14 00:54:46 +00:00
Romain Guy
819740cc73 Merge "Range check transfer params in float domain" into oc-dev 2017-04-13 23:35:27 +00:00
Romain Guy
bfa58aab0a Range check transfer params in float domain
Our native code uses floats for transfer parameters, the range
check was too small (using the next representable double instead
of the next representable float).

Bug: 37013532
Test: Manual run of broken app, CtsGraphicsTestCases
Change-Id: Id91a3e62068be0abf13ee75e39c758eb106a5f24
2017-04-13 12:59:38 -07:00
TreeHugger Robot
729a515e5e Merge "Introduce setFallbackTypeface" into oc-dev 2017-04-13 19:21:25 +00:00
Seigo Nonaka
b87a2f041d Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev am: d09be1c0e9
am: 284944c7f8

Change-Id: Idae84335677a859641b6660589848e04b4a38474
2017-04-13 17:57:46 +00:00