diff options
| author | Eric Fischer <enf@google.com> | 2010-02-23 16:45:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-23 16:45:41 -0800 |
| commit | 8ca1228168d05533b4810be337bb400356b2379e (patch) | |
| tree | cbac7f57bd3d5fca07fae9460cb05a270730cbd6 /core/tests | |
| parent | c1ba7431a45dbf10f211e7b0bbf5b03e64bf020c (diff) | |
| parent | 1065758a0f8966a8597a61492112f7859a7050a4 (diff) | |
| download | frameworks_base-8ca1228168d05533b4810be337bb400356b2379e.zip frameworks_base-8ca1228168d05533b4810be337bb400356b2379e.tar.gz frameworks_base-8ca1228168d05533b4810be337bb400356b2379e.tar.bz2 | |
Merge "Fix rounding of extra spacing when it is negative."
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/text/StaticLayoutTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/text/StaticLayoutTest.java b/core/tests/coretests/src/android/text/StaticLayoutTest.java index 1e4db3d..7511ec1 100644 --- a/core/tests/coretests/src/android/text/StaticLayoutTest.java +++ b/core/tests/coretests/src/android/text/StaticLayoutTest.java @@ -213,13 +213,13 @@ public class StaticLayoutTest extends TestCase { } public int scale(float height) { - int altVal = (int)(height * sMult + sAdd + 0.5); // existing impl + int altVal = (int)(height * sMult + sAdd + 0.5); int rndVal = Math.round(height * sMult + sAdd); if (altVal != rndVal) { Log.i("Scale", "expected scale: " + rndVal + " != returned scale: " + altVal); } - return altVal; // existing implementation + return rndVal; } } |