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

Merge "Fixed issue with invalid stretch params" into sc-dev

Browse Source
This commit is contained in:
Nader Jawad
2021-04-13 01:29:31 +00:00
committed by Android (Google) Code Review
parent d914330cfc 0a458ab55a
commit 93ea53bbe2
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -626,20 +626,14 @@ public class EdgeEffect {
// assume rotations of increments of 90 degrees // assume rotations of increments of 90 degrees
float x = mTmpPoints[10] - mTmpPoints[8]; float x = mTmpPoints[10] - mTmpPoints[8];
float width = right - left; float width = right - left;
float vecX = 0f; float vecX = dampStretchVector(Math.max(-1f, Math.min(1f, x / width)));
if (width > 0) {
vecX = dampStretchVector(Math.max(-1f, Math.min(1f, x / width)));
}
float y = mTmpPoints[11] - mTmpPoints[9]; float y = mTmpPoints[11] - mTmpPoints[9];
float height = bottom - top; float height = bottom - top;
float vecY = 0f; float vecY = dampStretchVector(Math.max(-1f, Math.min(1f, y / height)));
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; boolean hasValidVectors = Float.isFinite(vecX) && Float.isFinite(vecY);
if (right > left && bottom > top && mWidth > 0 && mHeight > 0 && hasStretchVectors) { if (right > left && bottom > top && mWidth > 0 && mHeight > 0 && hasValidVectors) {
renderNode.stretch( renderNode.stretch(
left, left,
top, top,