diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-28 19:21:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-28 19:21:58 +0000 |
| commit | 5189454083640c81bf3a171422b3ef114f150a77 (patch) | |
| tree | 2c5f26dd1e0d19aa61b6051076683dcbeadf5274 | |
| parent | 81284287a761a9ee512bd7d4857995fdd8d8dcbc (diff) | |
| parent | e1899e44368f7602afc5b87a75102e7ff551982c (diff) | |
| download | android_packages_apps_Trebuchet-5189454083640c81bf3a171422b3ef114f150a77.tar.gz android_packages_apps_Trebuchet-5189454083640c81bf3a171422b3ef114f150a77.tar.bz2 android_packages_apps_Trebuchet-5189454083640c81bf3a171422b3ef114f150a77.zip | |
am e1899e44: Merge "Adding size check when generating holographic outline" into ub-launcher3-burnaby
* commit 'e1899e44368f7602afc5b87a75102e7ff551982c':
Adding size check when generating holographic outline
| -rw-r--r-- | src/com/android/launcher3/HolographicOutlineHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/HolographicOutlineHelper.java b/src/com/android/launcher3/HolographicOutlineHelper.java index 5ff85d664..0d68e33b4 100644 --- a/src/com/android/launcher3/HolographicOutlineHelper.java +++ b/src/com/android/launcher3/HolographicOutlineHelper.java @@ -164,6 +164,9 @@ public class HolographicOutlineHelper { int bitmapWidth = (int) (rect.width() * view.getScaleX()); int bitmapHeight = (int) (rect.height() * view.getScaleY()); + if (bitmapHeight <= 0 || bitmapWidth <= 0) { + return null; + } int key = (bitmapWidth << 16) | bitmapHeight; Bitmap cache = mBitmapCache.get(key); |