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

Merge "Create 1x1 dummy surface when zero size is specified for drag shadow"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-02 01:59:16 +00:00
committed by Android (Google) Code Review
parent b1e3c9688a 29cae8904f
commit 6a5ede856f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/View.java
View File

@@ -23689,9 +23689,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
Point shadowTouchPoint = new Point();
shadowBuilder.onProvideShadowMetrics(shadowSize, shadowTouchPoint);
if ((shadowSize.x <= 0) || (shadowSize.y <= 0)
if ((shadowSize.x < 0) || (shadowSize.y < 0)
|| (shadowTouchPoint.x < 0) || (shadowTouchPoint.y < 0)) {
throw new IllegalStateException("Drag shadow dimensions must be positive");
throw new IllegalStateException("Drag shadow dimensions must not be negative");
}
// Create 1x1 surface when zero surface size is specified because SurfaceControl.Builder
// does not accept zero size surface.
if (shadowSize.x == 0 || shadowSize.y == 0) {
shadowSize.x = 1;
shadowSize.y = 1;
}
if (ViewDebug.DEBUG_DRAG) {