Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1236643 - Let GeckoInputConnection keep its view; r=esawin

Browse Source 
Right now GeckoInputConnection uses GeckoAppShell to get its view, but
it should be keeping its own View reference to support multiple
GeckoViews.
This commit is contained in:
Jim Chen 2016-01-06 21:33:18 -05:00
parent ae79cbc8c0
commit 51bc74f902
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/android/base/java/org/mozilla/gecko/GeckoInputConnection.java
View File

@ -222,6 +222,7 @@ class GeckoInputConnection
private String mCurrentInputMethod = "";
private final View mView;
private final GeckoEditableClient mEditableClient;
protected int mBatchEditCount;
private ExtractedTextRequest mUpdateRequest;
@ -241,6 +242,7 @@ class GeckoInputConnection
protected GeckoInputConnection(View targetView,
GeckoEditableClient editable) {
super(targetView, true);
mView = targetView;
mEditableClient = editable;
mIMEState = IME_STATE_DISABLED;
// InputConnection that sends keys for plugins, which don't have full editors
@ -377,11 +379,11 @@ class GeckoInputConnection
return extract;
}
private static View getView() {
return GeckoAppShell.getLayerView();
private View getView() {
return mView;
}
private static InputMethodManager getInputMethodManager() {
private InputMethodManager getInputMethodManager() {
View view = getView();
if (view == null) {
return null;
@ -390,7 +392,7 @@ class GeckoInputConnection
return InputMethods.getInputMethodManager(context);
}
private static void showSoftInput() {
private void showSoftInput() {
final InputMethodManager imm = getInputMethodManager();
if (imm != null) {
final View v = getView();
@ -416,7 +418,7 @@ class GeckoInputConnection
});
}
private static void hideSoftInput() {
private void hideSoftInput() {
final InputMethodManager imm = getInputMethodManager();
if (imm != null) {
final View v = getView();
@ -684,7 +686,7 @@ class GeckoInputConnection
outAttrs.actionLabel = mIMEActionHint;
}
Context context = GeckoAppShell.getContext();
Context context = getView().getContext();
DisplayMetrics metrics = context.getResources().getDisplayMetrics();
if (Math.min(metrics.widthPixels, metrics.heightPixels) > INLINE_IME_MIN_DISPLAY_SIZE) {
// prevent showing full-screen keyboard only when the screen is tall enough