diff options
| author | Winson Chung <winsonc@google.com> | 2010-12-04 18:11:57 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2010-12-04 18:12:47 -0800 |
| commit | 07f2e81d77b5f788e1d812011ea3d5b74acde4e4 (patch) | |
| tree | fdd6a5d8164417f3264e03aa27ef6a307ec27814 /src/com/android/launcher2/BubbleTextView.java | |
| parent | c66a7c275992281f299209533d4cf8cf24a6c71d (diff) | |
| download | android_packages_apps_Trebuchet-07f2e81d77b5f788e1d812011ea3d5b74acde4e4.tar.gz android_packages_apps_Trebuchet-07f2e81d77b5f788e1d812011ea3d5b74acde4e4.tar.bz2 android_packages_apps_Trebuchet-07f2e81d77b5f788e1d812011ea3d5b74acde4e4.zip | |
Adding text layout null check.
Change-Id: I7661aa7405b22db2d2497b39022632d4ad6aa2bc
Diffstat (limited to 'src/com/android/launcher2/BubbleTextView.java')
| -rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index 113f35dd8..855f261f8 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -147,16 +147,18 @@ public class BubbleTextView extends CacheableTextView { // Draw the hotdog bubble final Layout layout = getLayout(); - final int offset = getExtendedPaddingTop(); - final int paddingLeft = getPaddingLeft(); - final int paddingRight = getPaddingRight(); - final float left = layout.getLineLeft(0) + paddingLeft; - final float right = Math.min(layout.getLineRight(0) + paddingRight, - left + getWidth() - paddingLeft - paddingRight); - mRect.set(left - mPaddingH, offset + (int) layout.getLineTop(0) - mPaddingV, - right + mPaddingH, offset + (int) layout.getLineBottom(0) + mPaddingV); - - canvas.drawRoundRect(mRect, mCornerRadius, mCornerRadius, mPaint); + if (layout != null) { + final int offset = getExtendedPaddingTop(); + final int paddingLeft = getPaddingLeft(); + final int paddingRight = getPaddingRight(); + final float left = layout.getLineLeft(0) + paddingLeft; + final float right = Math.min(layout.getLineRight(0) + paddingRight, + left + getWidth() - paddingLeft - paddingRight); + mRect.set(left - mPaddingH, offset + (int) layout.getLineTop(0) - mPaddingV, + right + mPaddingH, offset + (int) layout.getLineBottom(0) + mPaddingV); + + canvas.drawRoundRect(mRect, mCornerRadius, mCornerRadius, mPaint); + } super.draw(canvas); } |