diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java index dac08933803..a48854fa3a5 100644 --- a/mobile/android/base/GeckoAppShell.java +++ b/mobile/android/base/GeckoAppShell.java @@ -497,8 +497,10 @@ public class GeckoAppShell public static void notifyIMEEnabled(int state, String typeHint, String actionHint, boolean landscapeFS) { + // notifyIMEEnabled() still needs the landscapeFS parameter because it is called from JNI + // code that assumes it has the same signature as XUL Fennec's (which does use landscapeFS). if (mInputConnection != null) - mInputConnection.notifyIMEEnabled(state, typeHint, actionHint, landscapeFS); + mInputConnection.notifyIMEEnabled(state, typeHint, actionHint); } public static void notifyIMEChange(String text, int start, int end, int newEnd) { diff --git a/mobile/android/base/GeckoInputConnection.java b/mobile/android/base/GeckoInputConnection.java index bfff2f62d22..54ae84e6f72 100644 --- a/mobile/android/base/GeckoInputConnection.java +++ b/mobile/android/base/GeckoInputConnection.java @@ -95,7 +95,6 @@ public class GeckoInputConnection private static int mIMEState; private static String mIMETypeHint; private static String mIMEActionHint; - private static boolean mIMELandscapeFS; // Is a composition active? private boolean mComposing; @@ -748,8 +747,8 @@ public class GeckoInputConnection else if (mIMEActionHint != null && mIMEActionHint.length() != 0) outAttrs.actionLabel = mIMEActionHint; - if (mIMELandscapeFS == false) - outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_EXTRACT_UI; + outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_EXTRACT_UI + | EditorInfo.IME_FLAG_NO_FULLSCREEN; reset(); return this; @@ -931,8 +930,7 @@ public class GeckoInputConnection } } - public void notifyIMEEnabled(int state, String typeHint, - String actionHint, boolean landscapeFS) { + public void notifyIMEEnabled(int state, String typeHint, String actionHint) { View v = GeckoApp.mAppContext.getLayerController().getView(); if (v == null) @@ -943,7 +941,6 @@ public class GeckoInputConnection mIMEState = state; mIMETypeHint = typeHint; mIMEActionHint = actionHint; - mIMELandscapeFS = landscapeFS; IMEStateUpdater.enableIME(); }