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

Merge change 956 into donut

Browse Source 
* changes:
  Fixes #1827988. Prevent marquee text from constantly rescaling itself in Market
This commit is contained in:
Android (Google) Code Review
2009-05-04 15:09:47 -07:00
parent 7ff943673e 3373ed62d1
commit beb2498ead
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4837,10 +4837,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
private boolean compressText(float width) { private boolean compressText(float width) {
if (width > 0.0f && mLayout != null && getLineCount() == 1 && !mUserSetTextScaleX) { // Only compress the text if it hasn't been compressed by the previous pass
if (width > 0.0f && mLayout != null && getLineCount() == 1 && !mUserSetTextScaleX &&
mTextPaint.getTextScaleX() == 1.0f) {
final float textWidth = mLayout.getLineWidth(0); final float textWidth = mLayout.getLineWidth(0);
final float overflow = (textWidth - width) / width; final float overflow = (textWidth + 1.0f - width) / width;
if (overflow > 0.0f && overflow <= Marquee.MARQUEE_DELTA_MAX) { if (overflow > 0.0f && overflow <= Marquee.MARQUEE_DELTA_MAX) {
mTextPaint.setTextScaleX(1.0f - overflow - 0.005f); mTextPaint.setTextScaleX(1.0f - overflow - 0.005f);
post(new Runnable() { post(new Runnable() {
@@ -5843,9 +5844,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final int textWidth = textView.getWidth() - textView.getCompoundPaddingLeft() - final int textWidth = textView.getWidth() - textView.getCompoundPaddingLeft() -
textView.getCompoundPaddingRight(); textView.getCompoundPaddingRight();
final float lineWidth = textView.mLayout.getLineWidth(0); final float lineWidth = textView.mLayout.getLineWidth(0);
mGhostStart = lineWidth - textWidth + textWidth / 3.0f; final float gap = textWidth / 3.0f;
mGhostStart = lineWidth - textWidth + gap;
mMaxScroll = mGhostStart + textWidth; mMaxScroll = mGhostStart + textWidth;
mGhostOffset = lineWidth + textWidth / 3.0f; mGhostOffset = lineWidth + gap;
mFadeStop = lineWidth + textWidth / 6.0f; mFadeStop = lineWidth + textWidth / 6.0f;
mMaxFadeScroll = mGhostStart + lineWidth + lineWidth; mMaxFadeScroll = mGhostStart + lineWidth + lineWidth;