Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed NaN exceptions in EdgeEffect" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-03 02:08:09 +00:00
committed by Android (Google) Code Review
parent 9ba0f37f8a 3a0b122b8d
commit c5f71969ab
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/widget/EdgeEffect.java
View File

@@ -626,20 +626,31 @@ public class EdgeEffect {
// assume rotations of increments of 90 degrees
float x = mTmpPoints[10] - mTmpPoints[8];
float width = right - left;
float vecX = dampStretchVector(Math.max(-1f, Math.min(1f, x / width)));
float vecX = 0f;
if (width > 0) {
vecX = dampStretchVector(Math.max(-1f, Math.min(1f, x / width)));
}
float y = mTmpPoints[11] - mTmpPoints[9];
float height = bottom - top;
float vecY = dampStretchVector(Math.max(-1f, Math.min(1f, y / height)));
renderNode.stretch(
left,
top,
right,
bottom,
vecX,
vecY,
mWidth,
mHeight
);
float vecY = 0f;
if (height > 0) {
vecY = dampStretchVector(Math.max(-1f, Math.min(1f, y / height)));
}
boolean hasStretchVectors = Float.compare(vecX, 0) != 0 || Float.compare(vecY, 0) != 0;
if (right > left && bottom > top && mWidth > 0 && mHeight > 0 && hasStretchVectors) {
renderNode.stretch(
left,
top,
right,
bottom,
vecX,
vecY,
mWidth,
mHeight
);
}
} else {
// This is TYPE_STRETCH and drawing into a Canvas that isn't a Recording Canvas,
// so no effect can be shown. Just end the effect.