summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-05-20 00:25:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-05-20 00:25:06 +0000
commit67b545e78871f63cd00a7997f60a11089f125cba (patch)
treece6ab9ddb47a8033bcdbb9339acf82e12957e246
parent706977f19e05b8f3521c011a9a9b8a3bf5c5abfe (diff)
parentf4123fd9e54552607c953f053278cf68cd7acfd2 (diff)
Merge "Gradient drawable bounds"
-rw-r--r--packages/SystemUI/colorextraction/src/com/google/android/colorextraction/drawable/GradientDrawable.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/drawable/GradientDrawable.java b/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/drawable/GradientDrawable.java
index e75d95a9226f..38e16f3d5840 100644
--- a/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/drawable/GradientDrawable.java
+++ b/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/drawable/GradientDrawable.java
@@ -157,7 +157,10 @@ public class GradientDrawable extends Drawable {
}
private void buildPaints() {
- final Rect bounds = mWindowBounds;
+ Rect bounds = mWindowBounds;
+ if (bounds.width() == 0) {
+ return;
+ }
float w = bounds.width();
float h = bounds.height();
@@ -177,7 +180,10 @@ public class GradientDrawable extends Drawable {
@Override
public void draw(@NonNull Canvas canvas) {
- final Rect bounds = mWindowBounds;
+ Rect bounds = mWindowBounds;
+ if (bounds.width() == 0) {
+ throw new IllegalStateException("You need to call setScreenSize before drawing.");
+ }
// Splat each gradient
float w = bounds.width();