summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-05-20 04:15:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-20 04:15:04 +0000
commita938867bc87faf7b35c9fc20192920f812ef5d5e (patch)
treeaa31ea9eb2557bae8f65e8f8efa571052c50e54b /src
parentb135956e95d2d7479290af89d618892ed0e7327d (diff)
parent5537faaf9f40c2d7cdb8ab5947f494ce96c832a3 (diff)
downloadandroid_packages_apps_Trebuchet-a938867bc87faf7b35c9fc20192920f812ef5d5e.tar.gz
android_packages_apps_Trebuchet-a938867bc87faf7b35c9fc20192920f812ef5d5e.tar.bz2
android_packages_apps_Trebuchet-a938867bc87faf7b35c9fc20192920f812ef5d5e.zip
Merge "Adding null check to outline generator" into ub-launcher3-burnaby
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/HolographicOutlineHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/HolographicOutlineHelper.java b/src/com/android/launcher3/HolographicOutlineHelper.java
index 4a04d038a..5ff85d664 100644
--- a/src/com/android/launcher3/HolographicOutlineHelper.java
+++ b/src/com/android/launcher3/HolographicOutlineHelper.java
@@ -157,6 +157,9 @@ public class HolographicOutlineHelper {
Bitmap createMediumDropShadow(BubbleTextView view) {
Drawable icon = view.getIcon();
+ if (icon == null) {
+ return null;
+ }
Rect rect = icon.getBounds();
int bitmapWidth = (int) (rect.width() * view.getScaleX());