aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-19 01:49:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-19 01:49:29 -0800
commit433651a228fcb0cb3a517efe024d978e7f1eb0ce (patch)
tree12c10803f08ce6510c39beb35e481f357b3ba32f /java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
parenta58431003c99f9f592a50a4d7eac13f5ad7a6698 (diff)
parented616083dda090775c6d17ca073ccb80aaa1c4bd (diff)
downloadlatinime-433651a228fcb0cb3a517efe024d978e7f1eb0ce.tar.gz
latinime-433651a228fcb0cb3a517efe024d978e7f1eb0ce.tar.xz
latinime-433651a228fcb0cb3a517efe024d978e7f1eb0ce.zip
am ed616083: Merge "Turn personalization on when important notice dialog is displayed"
* commit 'ed616083dda090775c6d17ca073ccb80aaa1c4bd': Turn personalization on when important notice dialog is displayed
Diffstat (limited to 'java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java')
-rw-r--r--java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
index e77c55069..8ea712835 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
@@ -504,12 +504,13 @@ final class SuggestionStripLayoutHelper {
hintView, 1.0f - mCenterSuggestionWeight, ViewGroup.LayoutParams.MATCH_PARENT);
}
- public void layoutImportantNotice(final View importantNoticeStrip, final int stripWidth) {
+ public void layoutImportantNotice(final View importantNoticeStrip, final int stripWidth,
+ final String importantNoticeTitle) {
final TextView titleView = (TextView)importantNoticeStrip.findViewById(
R.id.important_notice_title);
final int width = stripWidth - titleView.getPaddingLeft() - titleView.getPaddingRight();
titleView.setTextColor(mColorAutoCorrect);
- final CharSequence importantNoticeTitle = titleView.getText();
+ titleView.setText(importantNoticeTitle);
titleView.setTextScaleX(1.0f); // Reset textScaleX.
final float titleScaleX = getTextScaleX(
importantNoticeTitle, width, titleView.getPaint());