Seigo Nonaka
94bc52b2e1
Merge "Remove Typeface.create" into oc-dev am: 0a7096dccb
...
am: 0582ccb776
2017-04-25 19:38:26 +00:00
Seigo Nonaka
5a09c64345
Remove Typeface.create
...
Test: Manually done
Bug: 37514611
Bug: 37463988
Bug: 37281200
Change-Id: Ida704af910e0ae195b96803de506fa1e1d66c9f5
2017-04-25 09:38:39 -07:00
Jeff Sharkey
e01a56bb66
Merge "More auto-doc work." into oc-dev am: 6bc03748a7
...
am: f25b285706
2017-04-24 18:37:08 +00:00
Jeff Sharkey
6bc03748a7
Merge "More auto-doc work." into oc-dev
2017-04-22 19:11:34 +00:00
John Reck
edc106d63e
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev am: aec1fbeaa3
...
am: 30baf2affa
2017-04-21 23:48:38 +00:00
Adam Lesinski
ea957eb6d2
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev am: 5be3647a9e
...
am: 091fe96343
2017-04-21 23:40:31 +00:00
TreeHugger Robot
aec1fbeaa3
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
2017-04-21 23:25:54 +00:00
TreeHugger Robot
5be3647a9e
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
2017-04-21 22:35:57 +00:00
Jeff Sharkey
910e081216
More auto-doc work.
...
Add support for AnyThread, CallSuper, and UiThread.
Another related CL started documenting @RequiresPermission, so remove
duplicated information in existing APIs.
Suppress auto-doc on a handful of classes that are already
well-documented.
Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I791437dccec0f11d5349a23b982ba098cb551af8
2017-04-21 16:35:08 -06:00
John Reck
b8d152f5cd
Fix @throws javadoc on SurfaceTexture ctors
...
Change-Id: I63bd76ec4e44251b7e06ad6fc8aa5a3372104656
Fixes: 37323694
Test: Looked at generated docs, verified correct
2017-04-21 13:49:36 -07:00
Adam Lesinski
50954d2b4e
Propagate density through AdaptiveIconDrawable and BitmapDrawable
...
Resources#getDrawableForDensity now propagates the overridden
density through to AdaptiveIconDrawable so that the density can be
propagated to leaf BitmapDrawables correctly.
This enables AdaptiveIconDrawable to support higher resolution
foreground/background bitmaps for use in Launcher.
Bug: 36039665
Test: bit CtsContentTestCases:android.content.res.cts.ResourcesTest
Change-Id: Iaa9a5592626e38e1ff839a76f7c6cfb9e16e5dc1
2017-04-21 13:25:44 -07:00
Lucas Dupin
db83feae54
Merge "Add transfer mode support to ColorDrawable" into oc-dev am: eedceb5721
...
am: a17c58ff59
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
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
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
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
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
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
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
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
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
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
2017-04-14 21:19:25 +00:00
Romain Guy
e9cbbea820
Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev am: 1eaab2db82
...
am: fd715c7fbe
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
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
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
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
2017-04-14 16:33:12 +00:00
