summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Conley Owens <cco3@android.com> 2011-04-29 14:55:55 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-04-29 14:55:55 -0700
commit49df110aeb94ada810a8eec0540e30a25c267a56 (patch)
tree732a8cf2573b3be8ba0d5687f31302c7e3df226b
parentded7c652d754751e6fbde729d66825c69394d1cb (diff)
parentd66a92e6875bfc835adf0b100607afbf4bfc2761 (diff)
am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761': Eliminating dead code with no other effect than consuming battery life.
-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);