diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-02-13 20:10:09 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-13 20:10:09 -0800 |
| commit | 19d5d141a5fce4cde7bce63ac8c8275ddf4e29b2 (patch) | |
| tree | b4fd7a3d52a3b23e21b85365ba616f96ac17f38f /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 2565eca5477c74cf2ee9f521132658ade25d584b (diff) | |
| parent | 4197c6f3ab1db7d37bfb5fca05bd7169504f451e (diff) | |
| download | latinime-19d5d141a5fce4cde7bce63ac8c8275ddf4e29b2.tar.gz latinime-19d5d141a5fce4cde7bce63ac8c8275ddf4e29b2.tar.xz latinime-19d5d141a5fce4cde7bce63ac8c8275ddf4e29b2.zip | |
am 4197c6f3: Merge "Show the suggestion strip for the important notice"
* commit '4197c6f3ab1db7d37bfb5fca05bd7169504f451e':
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; |