drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I7082e366 into eclair

Browse Source 
* changes:
  Properly implement Paint.breakText for layoutlib.
This commit is contained in:
Android (Google) Code Review
2009-11-13 15:42:31 -08:00
parent 991475a2e5 76410f1eb3
commit ae2104371d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/layoutlib/bridge/src/android/graphics/Paint.java
View File

@ -950,7 +950,6 @@ public class Paint extends _Original_Paint {
@Override @Override
public int breakText(String text, boolean measureForwards, public int breakText(String text, boolean measureForwards,
float maxWidth, float[] measuredWidth) { float maxWidth, float[] measuredWidth) {
// NOTE: javadoc doesn't match. Just a guess.
return breakText(text, return breakText(text,
0 /* start */, text.length() /* end */, 0 /* start */, text.length() /* end */,
measureForwards, maxWidth, measuredWidth); measureForwards, maxWidth, measuredWidth);
@ -975,7 +974,18 @@ public class Paint extends _Original_Paint {
@Override @Override
public int breakText(CharSequence text, int start, int end, boolean measureForwards, public int breakText(CharSequence text, int start, int end, boolean measureForwards,
float maxWidth, float[] measuredWidth) { float maxWidth, float[] measuredWidth) {
return super.breakText(text, start, end, measureForwards, maxWidth, measuredWidth); char[] buf = new char[end - start];
int result;
TextUtils.getChars(text, start, end, buf, 0);
if (measureForwards) {
result = breakText(buf, 0, end - start, maxWidth, measuredWidth);
} else {
result = breakText(buf, 0, -(end - start), maxWidth, measuredWidth);
}
return result;
} }
/** /**