summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-29 15:11:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-29 15:11:26 -0700
commit95b533911cfcb1d0532f9277167edab478130006 (patch)
tree61aa2dbcd9de53a06233e20c09ed42d421dd66a4 /core/java/android/text
parent3513e1ca6fedf830269d4349f481cf5cae26251b (diff)
parent49df110aeb94ada810a8eec0540e30a25c267a56 (diff)
downloadframeworks_base-95b533911cfcb1d0532f9277167edab478130006.zip
frameworks_base-95b533911cfcb1d0532f9277167edab478130006.tar.gz
frameworks_base-95b533911cfcb1d0532f9277167edab478130006.tar.bz2
am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit '49df110aeb94ada810a8eec0540e30a25c267a56': Eliminating dead code with no other effect than consuming battery life.
Diffstat (limited to 'core/java/android/text')
-rw-r--r--core/java/android/text/style/DrawableMarginSpan.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/text/style/DrawableMarginSpan.java b/core/java/android/text/style/DrawableMarginSpan.java
index 3c471a5..c2564d5 100644
--- a/core/java/android/text/style/DrawableMarginSpan.java
+++ b/core/java/android/text/style/DrawableMarginSpan.java
@@ -50,9 +50,6 @@ implements LeadingMarginSpan, LineHeightSpan
int dw = mDrawable.getIntrinsicWidth();
int dh = mDrawable.getIntrinsicHeight();
- if (dir < 0)
- x -= dw;
-
// XXX What to do about Paint?
mDrawable.setBounds(ix, itop, ix+dw, itop+dh);
mDrawable.draw(c);