Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev

Browse Source 
* commit '96a9c9b5896aa6a8a956cc5fffca3f98b8c155c0':
  Make Paint a required field of StaticLayout Builder
This commit is contained in:
Raph Levien
2015-05-02 01:07:55 +00:00
committed by Android Git Automerger
parent f436e6e848 96a9c9b589
commit 151ccb9f58
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/text/DynamicLayout.java
View File

@@ -283,7 +283,7 @@ public class DynamicLayout extends Layout
if (reflowed == null) { if (reflowed == null) {
reflowed = new StaticLayout(null); reflowed = new StaticLayout(null);
b = StaticLayout.Builder.obtain(text, where, where + after, getWidth()); b = StaticLayout.Builder.obtain(text, where, where + after, getPaint(), getWidth());
} }
b.setText(text, where, where + after) b.setText(text, where, where + after)

7
core/java/android/text/StaticLayout.java
View File

@@ -57,7 +57,8 @@ public class StaticLayout extends Layout {
mNativePtr = nNewBuilder(); mNativePtr = nNewBuilder();
} }
public static Builder obtain(CharSequence source, int start, int end, int width) { public static Builder obtain(CharSequence source, int start, int end, TextPaint paint,
int width) {
Builder b = sPool.acquire(); Builder b = sPool.acquire();
if (b == null) { if (b == null) {
b = new Builder(); b = new Builder();
@@ -67,6 +68,7 @@ public class StaticLayout extends Layout {
b.mText = source; b.mText = source;
b.mStart = start; b.mStart = start;
b.mEnd = end; b.mEnd = end;
b.mPaint = paint;
b.mWidth = width; b.mWidth = width;
b.mAlignment = Alignment.ALIGN_NORMAL; b.mAlignment = Alignment.ALIGN_NORMAL;
b.mTextDir = TextDirectionHeuristics.FIRSTSTRONG_LTR; b.mTextDir = TextDirectionHeuristics.FIRSTSTRONG_LTR;
@@ -327,8 +329,7 @@ public class StaticLayout extends Layout {
: new Ellipsizer(source), : new Ellipsizer(source),
paint, outerwidth, align, textDir, spacingmult, spacingadd); paint, outerwidth, align, textDir, spacingmult, spacingadd);
Builder b = Builder.obtain(source, bufstart, bufend, outerwidth) Builder b = Builder.obtain(source, bufstart, bufend, paint, outerwidth)
.setPaint(paint)
.setAlignment(align) .setAlignment(align)
.setTextDir(textDir) .setTextDir(textDir)
.setSpacingMult(spacingmult) .setSpacingMult(spacingmult)

6
core/java/android/widget/TextView.java
View File

@@ -6630,8 +6630,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// TODO: code duplication with makeSingleLayout() // TODO: code duplication with makeSingleLayout()
if (mHintLayout == null) { if (mHintLayout == null) {
StaticLayout.Builder builder = StaticLayout.Builder.obtain(mHint, 0, StaticLayout.Builder builder = StaticLayout.Builder.obtain(mHint, 0,
mHint.length(), hintWidth) mHint.length(), mTextPaint, hintWidth)
.setPaint(mTextPaint)
.setAlignment(alignment) .setAlignment(alignment)
.setTextDir(mTextDir) .setTextDir(mTextDir)
.setSpacingMult(mSpacingMult) .setSpacingMult(mSpacingMult)
@@ -6721,8 +6720,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
if (result == null) { if (result == null) {
StaticLayout.Builder builder = StaticLayout.Builder.obtain(mTransformed, StaticLayout.Builder builder = StaticLayout.Builder.obtain(mTransformed,
0, mTransformed.length(), wantWidth) 0, mTransformed.length(), mTextPaint, wantWidth)
.setPaint(mTextPaint)
.setAlignment(alignment) .setAlignment(alignment)
.setTextDir(mTextDir) .setTextDir(mTextDir)
.setSpacingMult(mSpacingMult) .setSpacingMult(mSpacingMult)