am ed6bc82d: Merge "Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"" into ics-mr0

* commit 'ed6bc82d9785372c407e1a4f563ae7d30c479b8a':
  Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
This commit is contained in:
Tadashi G. Takaoka 2011-10-13 22:09:08 -07:00 committed by Android Git Automerger
commit 6262fa5307

View file

@ -1038,17 +1038,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
@Override
public boolean onEvaluateFullscreenMode() {
if (!super.onEvaluateFullscreenMode()) return false;
final EditorInfo ei = getCurrentInputEditorInfo();
if (ei != null) {
final int imeOptions = ei.imeOptions;
if ((imeOptions & EditorInfo.IME_FLAG_NO_EXTRACT_UI) != 0) {
return false;
}
}
return mResources.getBoolean(R.bool.config_use_fullscreen_mode);
return super.onEvaluateFullscreenMode()
&& mResources.getBoolean(R.bool.config_use_fullscreen_mode);
}
@Override