nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix important notice strip text layout"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2014-02-03 09:14:01 +00:00 committed by Android (Google) Code Review
commit 4d539f2c1e
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/res/layout/suggestions_strip.xml
View file

@ -52,9 +52,9 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/important_notice_title"
android:layout_width="0dp"
android:text="@string/important_notice_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:textSize="14sp"
style="?attr/suggestionWordStyle" />
</LinearLayout>

12
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
View file

@ -502,12 +502,18 @@ final class SuggestionStripLayoutHelper {
titleView.setTextColor(mColorAutoCorrect);
TextViewCompatUtils.setCompoundDrawablesRelativeWithIntrinsicBounds(
titleView, infoIcon, null, moreIcon, null);
final CharSequence importantNoticeTitle = res.getText(R.string.important_notice_title);
final CharSequence importantNoticeTitle = titleView.getText();
titleView.setTextScaleX(1.0f); // Reset textScaleX.
final float titleScaleX = getTextScaleX(importantNoticeTitle, width, titleView.getPaint());
titleView.setText(importantNoticeTitle);
// When the suggestions strip is displayed first time, stripWidth may be zero.
// Then importantNoticeTitle will be displayed as is without auto text scaleX.
// TODO: Fix the logic to always have a correct value of stripWidth.
if (width > 0) {
// Auto text scaleX to show entire important notice title should be on the strip.
final float titleScaleX = getTextScaleX(
importantNoticeTitle, width, titleView.getPaint());
titleView.setTextScaleX(titleScaleX);
}
}
static void setLayoutWeight(final View v, final float weight, final int height) {
final ViewGroup.LayoutParams lp = v.getLayoutParams();

1
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View file

@ -220,6 +220,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
return false;
}
// TODO: This method should be called after this View has been attached and displayed.
public void showImportantNoticeTitle() {
mLayoutHelper.layoutImportantNotice(mImportantNoticeStrip, getWidth());
mStripVisibilityGroup.showImportantNoticeStrip();