diff options
author | Dave Bort <dbort@android.com> | 2009-04-13 17:17:21 -0700 |
---|---|---|
committer | Dave Bort <dbort@android.com> | 2009-04-13 17:17:21 -0700 |
commit | 76c0226008ee16633dc94ed4dbeadef2174f6bd9 (patch) | |
tree | b53bf672f4ab7f82e2e1ab403a02a3a2740f2e96 | |
parent | 42bc2ff5d2e3a10ab6c1fb1e716a124f2b446dbc (diff) | |
download | frameworks_base-76c0226008ee16633dc94ed4dbeadef2174f6bd9.zip frameworks_base-76c0226008ee16633dc94ed4dbeadef2174f6bd9.tar.gz frameworks_base-76c0226008ee16633dc94ed4dbeadef2174f6bd9.tar.bz2 |
text: Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.
BUG=1780938
-rw-r--r-- | core/java/android/text/Layout.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index a6ed922..29dc2ea 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -24,7 +24,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Path; import com.android.internal.util.ArrayUtils; -import android.util.Config; import junit.framework.Assert; import android.text.style.*; @@ -39,6 +38,8 @@ import android.view.KeyEvent; * For text that will not change, use a {@link StaticLayout}. */ public abstract class Layout { + private static final boolean DEBUG = false; + /* package */ static final EmojiFactory EMOJI_FACTORY = EmojiFactory.newAvailableInstance(); /* package */ static final int MIN_EMOJI, MAX_EMOJI; @@ -330,7 +331,7 @@ public abstract class Layout { boolean hasTab = getLineContainsTab(i); if (directions == DIRS_ALL_LEFT_TO_RIGHT && !spannedText && !hasTab) { - if (Config.DEBUG) { + if (DEBUG) { Assert.assertTrue(dir == DIR_LEFT_TO_RIGHT); Assert.assertNotNull(c); } @@ -797,7 +798,7 @@ public abstract class Layout { } private int getLineVisibleEnd(int line, int start, int end) { - if (Config.DEBUG) { + if (DEBUG) { Assert.assertTrue(getLineStart(line) == start && getLineStart(line+1) == end); } @@ -1340,7 +1341,7 @@ public abstract class Layout { char[] buf; if (!hasTabs) { if (directions == DIRS_ALL_LEFT_TO_RIGHT) { - if (Config.DEBUG) { + if (DEBUG) { Assert.assertTrue(DIR_LEFT_TO_RIGHT == dir); } Styled.drawText(canvas, text, start, end, dir, false, x, top, y, bottom, paint, workPaint, false); |