wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 733196 - Do not use the fullscreen keyboard on Native Fennec (in portrait or landscape orientations). r=blassey

Browse Source
This commit is contained in:
Chris Peterson 2012-03-13 14:22:54 -07:00
parent df5d97e323
commit ffe4591ee7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/GeckoAppShell.java
View File

@ -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) {

9
mobile/android/base/GeckoInputConnection.java
View File

@ -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();
}