summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-28 23:52:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-28 23:52:21 -0700
commitd66a92e6875bfc835adf0b100607afbf4bfc2761 (patch)
treee28eee0434a5a19244d5c5c3f3751a1ff88d67e4 /core/java
parent893812b2ee4a640ad398f7f79f90b92d52a5f3b1 (diff)
parentda882181245fdf3eca827680d656cd298c9c318f (diff)
am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'da882181245fdf3eca827680d656cd298c9c318f': Eliminating dead code with no other effect than consuming battery life.
Diffstat (limited to 'core/java')
-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 3c471a50d7f8..c2564d58fb8a 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);