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

Merge "Inline a method for simplicity (B1)"

Browse source
This commit is contained in:
Jean Chalard 2012-06-15 15:52:14 -07:00 committed by Android (Google) Code Review
commit 6ebd93951f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1629,7 +1629,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
public boolean isSuggestionsRequested() { public boolean isSuggestionsRequested() {
// TODO: move this method to mCurrentSettings // TODO: move this method to mCurrentSettings
return (null != mInputAttributes && mInputAttributes.mIsSettingsSuggestionStripOn) return (null != mInputAttributes && mInputAttributes.mIsSettingsSuggestionStripOn)
&& (mCurrentSettings.isCorrectionOn() || isShowingSuggestionsStrip()); && (mCurrentSettings.isCorrectionOn()
|| mCurrentSettings.isSuggestionStripVisibleInOrientation(mDisplayOrientation));
} }
public boolean isShowingPunctuationList() { public boolean isShowingPunctuationList() {
@ -1637,16 +1638,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
return mCurrentSettings.mSuggestPuncList == mSuggestionsView.getSuggestions(); return mCurrentSettings.mSuggestPuncList == mSuggestionsView.getSuggestions();
} }
public boolean isShowingSuggestionsStrip() {
return mCurrentSettings.isSuggestionStripVisibleInOrientation(mDisplayOrientation);
}
public boolean isSuggestionsStripVisible() { public boolean isSuggestionsStripVisible() {
if (mSuggestionsView == null) if (mSuggestionsView == null)
return false; return false;
if (mSuggestionsView.isShowingAddToDictionaryHint()) if (mSuggestionsView.isShowingAddToDictionaryHint())
return true; return true;
if (!isShowingSuggestionsStrip()) if (!mCurrentSettings.isSuggestionStripVisibleInOrientation(mDisplayOrientation))
return false; return false;
if (null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn) if (null != mInputAttributes && mInputAttributes.mApplicationSpecifiedCompletionOn)
return true; return true;