diff options
author | Daniel Sandler <dsandler@google.com> | 2009-11-04 10:31:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-04 10:31:18 -0800 |
commit | 2950df32218b0cea97cf36bc6c3eb66c0a480d8e (patch) | |
tree | 92574dec0f531066931bb7d6b27b6e3fd1ef8fe9 | |
parent | da78da2ec7ef112fde493a0b82fab4d78b6b0918 (diff) | |
parent | 781ef4258c69c767e6ee49172ab0034310016009 (diff) | |
download | android_packages_wallpapers_LivePicker-2950df32218b0cea97cf36bc6c3eb66c0a480d8e.tar.gz android_packages_wallpapers_LivePicker-2950df32218b0cea97cf36bc6c3eb66c0a480d8e.tar.bz2 android_packages_wallpapers_LivePicker-2950df32218b0cea97cf36bc6c3eb66c0a480d8e.zip |
am 781ef425: am df807b99: Fix live wallpaper picker crash on launch.
Merge commit '781ef4258c69c767e6ee49172ab0034310016009'
* commit '781ef4258c69c767e6ee49172ab0034310016009':
Fix live wallpaper picker crash on launch.
-rw-r--r-- | src/com/android/wallpaper/livepicker/BubbleTextView.java | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/src/com/android/wallpaper/livepicker/BubbleTextView.java b/src/com/android/wallpaper/livepicker/BubbleTextView.java index 3ac5605..5b1bf80 100644 --- a/src/com/android/wallpaper/livepicker/BubbleTextView.java +++ b/src/com/android/wallpaper/livepicker/BubbleTextView.java @@ -37,7 +37,6 @@ public class BubbleTextView extends TextView { private Paint mPaint; private boolean mBackgroundSizeChanged; - private Drawable mBackground; private float mCornerRadius; private float mPaddingH; private float mPaddingV; @@ -58,7 +57,6 @@ public class BubbleTextView extends TextView { } private void init() { - mBackground = getBackground(); setBackgroundDrawable(null); mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); @@ -80,40 +78,7 @@ public class BubbleTextView extends TextView { } @Override - protected boolean verifyDrawable(Drawable who) { - return who == mBackground || super.verifyDrawable(who); - } - - @Override - protected void drawableStateChanged() { - Drawable d = mBackground; - if (d != null && d.isStateful()) { - d.setState(getDrawableState()); - } - super.drawableStateChanged(); - } - - @Override public void draw(Canvas canvas) { - final Drawable background = mBackground; - if (background != null) { - final int scrollX = mScrollX; - final int scrollY = mScrollY; - - if (mBackgroundSizeChanged) { - background.setBounds(0, 0, mRight - mLeft, mBottom - mTop); - mBackgroundSizeChanged = false; - } - - if ((scrollX | scrollY) == 0) { - background.draw(canvas); - } else { - canvas.translate(scrollX, scrollY); - background.draw(canvas); - canvas.translate(-scrollX, -scrollY); - } - } - final Layout layout = getLayout(); final RectF rect = mRect; final int left = getCompoundPaddingLeft(); @@ -127,16 +92,4 @@ public class BubbleTextView extends TextView { super.draw(canvas); } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - mBackground.setCallback(this); - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - mBackground.setCallback(null); - } } |