aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-10-25 19:31:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-25 19:31:27 -0700
commit6067b9e1bd26e3914c3fd21862e6dfe91c208551 (patch)
tree7d9b44ec102d3986092c1c03f551081fd347b381 /java/src
parent47cac57e4593f47e753410e4199e84e458d6de6f (diff)
parentef5f88f33e432284c958fafe18f891a10f77e1f9 (diff)
downloadlatinime-6067b9e1bd26e3914c3fd21862e6dfe91c208551.tar.gz
latinime-6067b9e1bd26e3914c3fd21862e6dfe91c208551.tar.xz
latinime-6067b9e1bd26e3914c3fd21862e6dfe91c208551.zip
am ef5f88f3: am 5e118c4c: am 60dea36d: Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
* commit 'ef5f88f33e432284c958fafe18f891a10f77e1f9': Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index b4d36a64c..829b0c89d 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1061,7 +1061,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