am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN

* commit '60dea36dafc4a567b948b5175bcca776b08fdfad':
  Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
This commit is contained in:
Satoshi Kataoka 2012-10-25 19:26:35 -07:00 committed by Android Git Automerger
commit 5e118c4c04

View File

@ -1063,7 +1063,16 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
// Reread resource value here, because this method is called by framework anytime as needed.
final boolean isFullscreenModeAllowed =
mCurrentSettings.isFullscreenModeAllowed(getResources());
return super.onEvaluateFullscreenMode() && isFullscreenModeAllowed;
if (super.onEvaluateFullscreenMode() && isFullscreenModeAllowed) {
// TODO: Remove this hack. Actually we should not really assume NO_EXTRACT_UI
// implies NO_FULLSCREEN. However, the framework mistakenly does. i.e. NO_EXTRACT_UI
// without NO_FULLSCREEN doesn't work as expected. Because of this we need this
// hack for now. Let's get rid of this once the framework gets fixed.
final EditorInfo ei = getCurrentInputEditorInfo();
return !(ei != null && ((ei.imeOptions & EditorInfo.IME_FLAG_NO_EXTRACT_UI) != 0));
} else {
return false;
}
}
@Override