diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-02-14 04:07:46 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-02-14 04:07:46 +0000 |
| commit | 4197c6f3ab1db7d37bfb5fca05bd7169504f451e (patch) | |
| tree | a2c096df9dd2efdf9b388ae225bb4b34d9b7c55a /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | a2c8e166e9d680ee0121f1e01c2f33305623c59d (diff) | |
| parent | 8adedbf47c7ac150d4ac7e6cdbee3ece38f346e7 (diff) | |
| download | latinime-4197c6f3ab1db7d37bfb5fca05bd7169504f451e.tar.gz latinime-4197c6f3ab1db7d37bfb5fca05bd7169504f451e.tar.xz latinime-4197c6f3ab1db7d37bfb5fca05bd7169504f451e.zip | |
Merge "Show the suggestion strip for the important notice"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index e9468a28d..7b72e8044 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1320,6 +1320,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen return false; if (mSuggestionStripView.isShowingAddToDictionaryHint()) return true; + if (ImportantNoticeUtils.hasNewImportantNoticeAndNotInSetupWizard(this)) + return true; if (null == currentSettings) return false; if (!currentSettings.isSuggestionStripVisible()) @@ -1352,7 +1354,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen if (mSuggestionStripView != null) { final boolean showSuggestions; if (SuggestedWords.EMPTY == suggestedWords - || suggestedWords.mIsPunctuationSuggestions) { + || suggestedWords.mIsPunctuationSuggestions + || !mSettings.getCurrent().isSuggestionsRequested()) { showSuggestions = !mSuggestionStripView.maybeShowImportantNoticeTitle(); } else { showSuggestions = true; |