3896 Commits

Author SHA1 Message Date
Kevin Hufnagle
1d61926379 docs: Added missing comma in RectF class description.
Test: make ds-docs -j32

Bug: 132942874
Change-Id: I8e9d2bfa620be35ef66bd9b05c4a0b9e4727cafa
2019-07-30 18:57:37 +00:00
TreeHugger Robot
fcbde5243a Merge "Fix ColorStateListDrawable bounds handling" into qt-dev 2019-06-20 17:32:31 +00:00
TreeHugger Robot
6e4e9817b8 Merge "Added null checks to LayerDrawable implementation" into qt-dev 2019-06-20 16:58:45 +00:00
Winson
eca29cf944 Fix ColorStateListDrawable bounds handling
The inner Drawable was never updated.

Bug: 135592087

Test: atest ColorStateListDrawableTest
Test: manual test valid ColorStateList XML in res/color

Change-Id: If922acd3054ded7cc068241376ebf7017e1ff6ff
2019-06-19 16:38:28 -07:00
Nader Jawad
abfcd0aa86 Added null checks to LayerDrawable implementation
Added null checks around usages of drawable child layers
within the constructor as well as the isProjected method

Test: Added cts tests to LayerDrawableTest
Bug: 134902243
Change-Id: I94a5fbc896ab53e29f4db4dcd04daf0bf9dd66dc
2019-06-18 15:53:26 -07:00
TreeHugger Robot
741e818ef3 Merge "Fixed issue where negative angles were not parsed properly" into qt-dev 2019-06-07 00:43:31 +00:00
Leon Scroggins
9be1d08acb Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev 2019-05-30 18:31:40 +00:00
Leon Scroggins III
63eb6e495a Allow non-convex paths in Outline#setConvexPath
Bug: 131759669
Test: I5eca77e1a60e484e4e118b7e464a88363c539ca9
Test: Manual - assert no longer fires and app looks normal

The limitation to only support convex paths was due to a limitation
in the old renderer. Today, it is fine to use a concave path. Further,
Skia has changed how it computes complexity - it is more conservative,
so paths which were previously thought to be convex are no longer. We
cannot guarantee that a path will be considered convex (especially
after e.g. rotating it, as in the library in question), so drop the
requirement.

Change-Id: Ice88d0995750e066320cb175a87f8ae70ce3aeed
2019-05-30 09:38:04 -04:00
Nader Jawad
364bf189e8 Fixed issue where negative angles were not parsed properly
Added logic to wrap negative angle measures provided
for linear gradients to be between 0 and 360

Test: Added cts test to GradientDrawableTest
Bug: 132650579
Change-Id: Iefde8bfc4b043dbe9dc57247f48077587fb03f6e
2019-05-29 18:53:11 -07:00
TreeHugger Robot
9fdd35e9aa Merge "Fix fading edge effect from impacting neighboring pixels" into qt-dev 2019-05-22 21:32:59 +00:00
TreeHugger Robot
2516b14955 Merge "Move GradientDrawable stroke fields back to grey list" into qt-dev 2019-05-20 22:40:54 +00:00
Nader Jawad
87d098908b Move GradientDrawable stroke fields back to grey list
The following fields are still lacking public getters:
Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashGap:F
Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashWidth:F
Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeWidth:I

Removed the maxTargetSdk from the @UnsupportedAppUsage
annotation.

Bug: 132971065
Test: N/A
Change-Id: Id19452a8db6cda43c7d1b3c3c5ee74468c6de4e1
2019-05-20 13:37:43 -07:00
Derek Sollenberger
9d25cc242f Fix fading edge effect from impacting neighboring pixels
Bug: 132354626
Bug: 129117085
Test: skia unit tests and test cases described in the bug
Change-Id: Ieaa7c831dd6298ac0565e6f1837b1c1dbd4545da
(cherry picked from commit ac33a487516196e9f1cf830e78313806e6daf777)
2019-05-17 17:59:57 +00:00
Nader Jawad
b8a529ff1f Fixed issue where GradientDrawable orientation was not
consumed properly

Moved methods to resolve the current gradient orientation
from GradientDrawable to GradientState. Fixed issue where
orientation parameter was not consumed properly in the
GradientDrawable constructor causing the angle and orientation
parameters to be out of sync.

Bug: 132420435
Test: Added test to CTS to verify GradientDrawable constructor behavior
Change-Id: I639d1ab4b8791810ea72c3f85878a8c7d9093661
2019-05-14 21:37:19 +00:00
Leon Scroggins
6e5efabcfd Merge "Pass ColorSpace along with HardwareBuffers" into qt-dev 2019-05-02 15:15:02 +00:00
Nader Jawad
de546a4868 Fixed issue where GradientDrawable would fail inflation
with invalid angle parameters

Previously, GradientDrawable would fail xml parsing if
an angle measurement was not a multiple of 45 and the type
of gradient is linear. Restore the original behavior to only
verify the angle measurement only if the type is linear
instead of verifying this requirement for all gradient types.

Removed restriction that radii must be non-negative as
subsequent logic in GradientDrawable already clamps the radius
to valid parameters.

Bug: 130309904
Test: Updated tests in CtsGradientDrawableTest
Change-Id: Ib1b3a0bb80639ddc00be7e630c62e781dfa6d9cf
2019-05-01 11:59:55 -07:00
Leon Scroggins III
3e2d7b7fe0 Pass ColorSpace along with HardwareBuffers
Bug: 130148101
Bug: 120904891
Test: I3bdb6a7edbab4b9b8f13d4597e5987e6db6fe928

Bitmap#wrapHardwareBuffer defaults to using the SRGB ColorSpace (i.e. if
null is supplied), but it's possible that where the HardwareBuffer was
originally used, it was associated with a different ColorSpace. Update
clients of this API to pass that ColorSpace.

Pass the ColorSpace's ID. This results in only supporting Named
ColorSpaces, which matches some of our other ColorSpace support, and
should be enough for most use cases.

Change-Id: I02460f079ed467199f368b4a4fd7708d6fa5433a
2019-04-25 16:48:08 +00:00
Seigo Nonaka
37d181673b Fix performance regression by fixing keys used in Typeface.Builder
The key used in Typeface.Builder is different from the key used in
findFromCache method. The problem is key generation in Typeface.Builder
since the key should be created from requested parameters not the actual
font styles.

Here is the raw performance differences on walleye-userdebug

android.graphics.perftests.TypefaceCreatePerfTest(us):
  createFromResources: 248 -> 23: (-225, -90.7%)

Bug: 131167183
Test: manually collected perf test result.
Change-Id: Idea25095979707ac84b7f4bc1ede0c2daefd6127
2019-04-23 13:21:27 -07:00
Nader Jawad
531db61ac1 Added BlendMode equivalent APIs to replace deprecated PorterDuff
variants

Updated various framework Views to have equivalent BlendMode APIs
to replace the deprecated PorterDuff equivalents.
Updated InspectableProperty annotations to refer to the same
xml attributes as the original tintmode APIs

Bug: 126726419
Test: Added CTS tests to verify new BlendMode APIs
Change-Id: Id9ab36d3d4d29f351250723e9d13d49bc6062c83
Merged-In: Id9ab36d3d4d29f351250723e9d13d49bc6062c83
2019-04-17 21:11:39 +00:00
Sunny Goyal
62915b28e0 Fixing HardwareBuffer leak when creating a bitmap
Callers are supposed to close the hardware buffer themselves. Creating
a utility method around this

Bug: 123874711
Test: No more leak warning on device
Change-Id: I2cf215f0646222f63e564a58edab1ffffa396ff3
2019-04-10 21:59:57 +00:00
Nader Jawad
52c090c749 Fix LaTeX formatting in Android documentation
Added missing usesMathJax tag within Javadoc for
each BlendMode enum value. This should ensure that the
blending formulas are rendered properly in the android documentation

Test: N/A
Bug: 130041190
Change-Id: I6c6dcc1804d8399468191bf758bf6cc7685918b5
(cherry picked from commit 39055b05e023a76941eb601d2c18df6b6db88117)
2019-04-05 23:28:36 +00:00
TreeHugger Robot
a78f842121 Merge "Relaxed nullability requirements for setTintMode APIs for both PorterDuff.Mode and BlendMode" 2019-04-01 16:26:32 +00:00
Nader Jawad
7ddb3965d9 Relaxed nullability requirements for setTintMode APIs for
both PorterDuff.Mode and BlendMode

The existing documentation had annotated the PorterDuff.Mode
parameter of Drawable#setTintMode to be @NonNull. However,
some applications were still passing in null as a parameter.
This was fine in previous releases as the default implementation
of Drawable#setTintMode did not read this field. With the
recent changes to introduce the BlendMode API, the nullability
assumption broke for various apps that passed in null, causing
NullPointerExceptions to be thrown.

Instead, update the documentation to be nullable and internally
convert the parameter to the corresponding default for either
PorterDuff.Mode or BlendMode.

Test: Added CTS tests to verify null behavior for each setTintMode
overload
Bug: 129446670

Change-Id: I42a4b03d190e5a64df518b5c768b2c22853abf12
2019-03-29 14:08:44 -07:00
Nader Jawad
129f414e70 Fixed issue where XmlPullParserExceptions are thrown with
Theme defined GradientDrawable attributes

Fixed issue where attributes that are supposed to be defined
together would throw exceptions if they are configured through
multiple inflation passes both with and without theme attributes.
Removed conditional logic that would parse attributes only
if the corresponding gradient type matched. Instead, attributes
are parsed on each inflation pass, falling back on previously
resolved parameters in the absence of a field. Validation
of the radius parameters has moved to ensureValidRect

Test: Added test to GradientDrawableTest
Bug: 127838188
Change-Id: Ie05e416eb747c774b9a39d4d0be28e1e775f0db5
2019-03-28 23:48:30 +00:00
TreeHugger Robot
d4b6ff816d Merge "Pass Bitmap's native instance to JNI where feasible" 2019-03-27 23:08:42 +00:00
Lei Yu
436e40de8a Merge "Remove circular dependency in BlendMode.java" 2019-03-27 20:52:52 +00:00
jackqdyulei
846af9caf0 Remove circular dependency in BlendMode.java
For some reason this circular dependency will create crash in
robo tests.

Fixes: 129417525
Test: RunSettingsRoboTests
Change-Id: Ic7641840ecfed9ba0270d7d9ce03622a7053df74
2019-03-27 20:51:47 +00:00
TreeHugger Robot
cdbd41b6ee Merge "Remove bitmap::getBitmapAllocationByteCount" 2019-03-27 19:03:27 +00:00
Leon Scroggins III
71fae62f5f Pass Bitmap's native instance to JNI where feasible
Test: CtsGraphicsTestCases, CtsUiRenderingTestCases,
      CtsRenderscriptTestCases

This is significantly faster than passing the Java object down and then
calling a JNI method to retrieve the pointer. See
https://buganizer.corp.google.com/issues/16656908#comment19

In some cases this changes what used to be native crashes (due to
android::BitmapWrapper:assertValid's LOG_ALWAYS_FATAL_IF) into
NullPointerExceptions (if a caller used a null Bitmap).

In addition:
- Remove unnecessary JNIEnv param from toBitmap(jlong)
- Change instances of toBitmap(JNIEnv*, jobject) to the above
- Replace calls to GraphicsJNI::getSkBitmap() to inline calls to
  toBitmap/getSkBitmap
- make Canvas#nInitRaster @FastNative (FIXME: Could these be
  @CriticalNative?)

Change-Id: I6194097be1b6e6952eba70e1e7052a5a250eed93
2019-03-27 13:39:23 -04:00
Nader Jawad
40a43424ee Merge "Added framework APIs to leverage new BlendMode API" 2019-03-27 16:39:03 +00:00
Nader Jawad
dadf251a0d Added framework APIs to leverage new BlendMode API
Updated various framework APIs to leverage the new BlendMode API
that parallels the corresponding porterduff mode equivalent.

Added new Drawable#onApplyBlendMode API that provides a backward
compatible solution for Drawable implementations that leverage
the new BlendMode API as well as fall back on the traditional
setTintMode(PorterDuff.Mode) API for instances where it is not
implemented

Bug:126726419
Test: Re-ran CTS graphics test cases
Change-Id: I119a7f57dce0a095c0a73cf83dc50b82beff5e32
2019-03-26 16:44:10 -07:00
Leon Scroggins III
ca8aef6376 Remove bitmap::getBitmapAllocationByteCount
Test: I7eb02bc2389aadc10ee0b65993bb7e2dab27a129

Also remove gBitmap_getAllocationByteCountMethodID. These called into
Java, which then called back into native. Instead, call the native method
directly. The only extra wrinkle is that the Java method returns 0
if (mRecycled). But we would never reach that return value, since if
it was recycled, we would have crashed in native Bitmap::assertValid.
Instead, throw an IllegalArgumentException when attempting to reuse
it.

This avoids the overhead of two JNI calls, which tend to be slow.

Change-Id: I29e8d2428036252cfad532b1351e3a3d33817b43
2019-03-26 16:50:32 -04:00
TreeHugger Robot
865ce750ed Merge "Fix empty CompositePositionUpdateListener" 2019-03-26 17:37:22 +00:00
Leon Scroggins
75ca391bbe Merge "Clean up references to @ColorLong" 2019-03-26 12:45:45 +00:00
Adam Powell
6b46fc59d4 Fix empty CompositePositionUpdateListener
ArrayUtils methods can return null. Fix the assumption made by CPUL.

Test: atest android.view.cts.SystemGestureExclusionRectsTest
Change-Id: I513e179b9a5715c381218a1ceb7e35dc91d1797a
2019-03-25 13:57:42 -07:00
Haoyu Zhang
ede0851fdf Fix comment of MeasuredText
Bug: N/A
Test: make offline-sdk-docs
Change-Id: If60cbf4ed05ec07ac0be24689ee01d0763ba9b31
2019-03-22 23:26:37 +00:00
TreeHugger Robot
05591aeaf9 Merge "Reland "Make Paint default to filtering Bitmaps"" 2019-03-22 05:43:36 +00:00
Leon Scroggins III
fda4f61060 Clean up references to @ColorLong
Bug: 120904891
Test: make docs && look at the output

Remove instances of {@link ColorLong}. Although the link is supposed to
go to
    https://developer.android.com/reference/android/annotation/ColorLong.html
my web browser redirects me to
    https://developer.android.com/reference
Perhaps there's a bug somewhere in the generation (I am able to navigate
to
    https://developer.android.com/reference/android/support/annotation/ColorLong?hl=en
by searching on developer.android.com - notice the addition of
"support"), but I still think it would make more sense to send users to
the page for android.graphics.Color directly.

Switch over to {@code ColorLong} (which does not generate a link) and a
reference to look at the {@link Color} class.

Update parameter named "c" to one named "color".

Unify various Canvas#drawColor APIs to say "to draw onto the canvas"
(previously some said this, while others said "to draw with").

Change-Id: I78eff5c35e350f763aac0416f6ec1ccf12f89418
2019-03-21 16:04:06 -04:00
TreeHugger Robot
be1d460a88 Merge "Revive the old behavior of unsupported filed in public APIs" 2019-03-20 20:11:14 +00:00
Seigo Nonaka
7d3d2aa286 Revive the old behavior of unsupported filed in public APIs
The behavior of the Typeface creating function when unsuppoted font
files are passed has changed unexpectedly. This CL revives the old
behaviors. Here is the list of public APIs and expected behaviors.

Resources#getFont for unsupported font
  Exception: Resources#NotFoundException
Resources#getFont for unsupported font in XML
  Exception: Resources#NotFoundException
Resources#getFont for unsupported font from provider
  No Exception: Typeface.DEFAULT is returned

Typeface#Builder for unsupported font
  No Exception: null is returned
Typeface#Builder for unavailable font
  No Exception: null is returned

Typeface#createFromAsset for unsupported font
  Not Exception: Typeface.DEFAULT is returned
Typeface#createFromAsset for unavailable font
  Exception: RuntimeExcetpion

FontsContract#buildTypeface for unspported font
  No Exception: null is returned
FontsContract#buildTypeface for unspported font in XML
  No Exception: null is returned
FontsContract#buildTypeface for unspported font from provider
  No Exception: null is returned

TextView inflation for unsupported font
  No Exception: Typeface.DEFAULT is set
TextView inflation for unsupported font in XML
  No Exception: Typeface.DEFAULT is set
TextView inflation for unsupported font from provider
  No Exception: Typeface.DEFAULT is set

Bug: 127714175
Test: Manually done
Change-Id: Iaab037f4168546409ead67ed8eee7340418418ed
2019-03-20 10:22:55 -07:00
Daniel Solomon
244daaeddc Change Display White Balance to track the Planckian locus
Currently when DWB adjusts the display's white point it uses standard
Illuminant D to convert CCT to CIE xy coordinates. This causes a slight
green tint, detectable by some users. Change this behavior to calculate
CIE xy based on the Planckian locus.

Bug: 128712066
Test:
a. Manual, by overriding target DWB CCT and observing resulting target
xy coordinates
b. atest FrameworksServicesTests:ColorDisplayServiceTest, making sure
there are no new failures (existing failures tracked in a separate bug)

Change-Id: I6fa336ee694730df45d5eacceb442aa556b5718e
2019-03-19 14:57:30 -07:00
Seigo Nonaka
67e8cb2bfc Hide MeasuredText.getChars
The MeasuredText.getChars is used only from text layout internals:
- LineBreaker#computeLineBreaks
- Canvas.drawtextRun

Thus, no need to be exposed to public. Making it @hide

Change-Id: I7c27a4b95d7d5ebc2ad5d74c947cdea3ce08f2ab
Fix: 124795470
Test: N/A
2019-03-18 10:13:27 -07:00
TreeHugger Robot
8ae1fcaf8d Merge "Revert "Always suppress font error during resource loading"" 2019-03-15 23:27:35 +00:00
Seigo Nonaka
848e83f663 Revert "Always suppress font error during resource loading"
This reverts commit 96e93959fb8cb27db1829b28113558cc8136c858.

Reason for revert: 
This breaks CTS. Looks like even in old devices, we tells errors to
developers. Just suppression is not a right solution here.

Change-Id: Ia1b1916d94d115174afe8e822fc669b37e5f3937
2019-03-15 21:07:44 +00:00
Leon Scroggins III
99473d17ce Reland "Make Paint default to filtering Bitmaps"
Bug: 77949917
Test: Iac4922cfa86c0c2b3b6c88b39d9b702ab046cd34

In P, the switch to Skia HW rendering lost a feature of HWUI's old
renderer: using a Paint with a BitmapShader resulted in filtering the
Bitmap, regardless of whether FILTER_BITMAP_FLAG was set.

This somewhat restores that behavior, in that it results in filtering
BitmapShaders so long as the client doesn't explicitly turn it off. This
also means that it continues to be possible to get a pixellated drawing
if the client *does* explicitly turn it off.

This reverts commit 1b6927dbb1620cc5edf9b14a2627de5a7a975c17. Original
CL was reverted due to a broken CTS test, which will be updated along
with this.

Change-Id: I61394b4ca6b93ba8405a0127b9c308444abfcbc2
2019-03-15 12:53:03 +00:00
Leon Scroggins
c052fa2032 Merge changes I241824bf,I9021864f
* changes:
  Convert ColorLong in native code in Paint
  Restore Paint#nSetColor(@ColorInt)
2019-03-15 12:14:20 +00:00
TreeHugger Robot
0099e49e19 Merge "Revert "Make Paint default to filtering Bitmaps"" 2019-03-15 07:26:46 +00:00
Roger Wang
1b6927dbb1 Revert "Make Paint default to filtering Bitmaps"
This reverts commit 1a732211990d88549e0ee18afc087f068d22069e.

Reason for revert: cts failure, b/128641982

Change-Id: If27a39d8d4f6cc03c642b63be1a32af187ce8758
2019-03-15 04:13:51 +00:00
TreeHugger Robot
8c13853db7 Merge "Make Paint default to filtering Bitmaps" 2019-03-14 19:58:47 +00:00
TreeHugger Robot
7e7a8efd5f Merge "Stop double-counting native memory in graphics classes" 2019-03-14 17:03:30 +00:00