Merge "Simplification (B4)"

This commit is contained in:
Jean Chalard 2012-06-18 10:55:59 -07:00 committed by Android (Google) Code Review
commit 56523ce0bf

View file

@ -238,12 +238,8 @@ public class SettingsValues {
return mInputAttributes.mEditorAction == EditorInfo.IME_ACTION_NEXT;
}
private boolean isSuggestionStripRequestedByTextField() {
return mInputAttributes.mIsSettingsSuggestionStripOn;
}
public boolean isSuggestionsRequested(final int displayOrientation) {
return isSuggestionStripRequestedByTextField()
return mInputAttributes.mIsSettingsSuggestionStripOn
&& (isCorrectionOn() || isSuggestionStripVisibleInOrientation(displayOrientation));
}