Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13d6ecc4 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove InputMethodServiceCompatWrapper 

Bug: 6129704
Change-Id: I76f2854e27623be940a711d0d48fd3f90132141c
parent 8443af57

java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.inputmethod.compat;



import android.content.Context;

import android.inputmethodservice.InputMethodService;

import android.os.IBinder;

import android.util.Log;

import android.view.inputmethod.InputMethodInfo;
@@ -45,7 +46,7 @@ public class InputMethodManagerCompatWrapper { 
        return sInstance;

    }



    public static void init(InputMethodServiceCompatWrapper service) {

    public static void init(InputMethodService service) {

        sInstance.mImm = (InputMethodManager) service.getSystemService(

                Context.INPUT_METHOD_SERVICE);

    }

java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.inputmethod.compat;



import android.app.AlertDialog;

import android.inputmethodservice.InputMethodService;

import android.os.IBinder;

import android.view.Window;

import android.view.WindowManager;



import com.android.inputmethod.keyboard.KeyboardSwitcher;



public class InputMethodServiceCompatWrapper extends InputMethodService {

    // For compatibility of {@link InputMethodManager#showInputMethodPicker}.

    // TODO: Move this variable back to LatinIME when this compatibility wrapper is removed.

    protected AlertDialog mOptionsDialog;



    public void showOptionDialogInternal(AlertDialog dialog) {

        final IBinder windowToken = KeyboardSwitcher.getInstance().getKeyboardView()

                .getWindowToken();

        if (windowToken == null) return;



        dialog.setCancelable(true);

        dialog.setCanceledOnTouchOutside(true);



        final Window window = dialog.getWindow();

        final WindowManager.LayoutParams lp = window.getAttributes();

        lp.token = windowToken;

        lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;

        window.setAttributes(lp);

        window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);



        mOptionsDialog = dialog;

        dialog.show();

    }



    protected static void setTouchableRegionCompat(InputMethodService.Insets outInsets,

            int x, int y, int width, int height) {

        outInsets.touchableInsets = InputMethodService.Insets.TOUCHABLE_INSETS_REGION;

        outInsets.touchableRegion.set(x, y, width, height);

    }

}

java/src/com/android/inputmethod/latin/LatinIME.java

+26 −3
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewGroup.LayoutParams;

import android.view.ViewParent;

import android.view.Window;

import android.view.WindowManager;

import android.view.inputmethod.CompletionInfo;

import android.view.inputmethod.CorrectionInfo;

import android.view.inputmethod.EditorInfo;
@@ -56,7 +58,6 @@ import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy; 
import com.android.inputmethod.compat.CompatUtils;

import com.android.inputmethod.compat.EditorInfoCompatUtils;

import com.android.inputmethod.compat.InputMethodManagerCompatWrapper;

import com.android.inputmethod.compat.InputMethodServiceCompatWrapper;

import com.android.inputmethod.compat.SuggestionSpanUtils;

import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.keyboard.KeyboardActionListener;
@@ -75,7 +76,7 @@ import java.util.Locale; 
/**

 * Input method implementation for Qwerty'ish keyboard.

 */

public class LatinIME extends InputMethodServiceCompatWrapper implements KeyboardActionListener,

public class LatinIME extends InputMethodService implements KeyboardActionListener,

        SuggestionsView.Listener {

    private static final String TAG = LatinIME.class.getSimpleName();

    private static final boolean TRACE = false;
@@ -225,6 +226,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 


    private boolean mIsAutoCorrectionIndicatorOn;



    private AlertDialog mOptionsDialog;



    public final UIHandler mHandler = new UIHandler(this);



    public static class UIHandler extends StaticInnerHandlerWrapper<LatinIME> {
@@ -973,7 +976,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            final int touchHeight = inputView.getHeight() + extraHeight

                    // Extend touchable region below the keyboard.

                    + EXTENDED_TOUCHABLE_REGION_HEIGHT;

            setTouchableRegionCompat(outInsets, 0, touchY, touchWidth, touchHeight);

            outInsets.touchableInsets = InputMethodService.Insets.TOUCHABLE_INSETS_REGION;

            outInsets.touchableRegion.set(0, touchY, touchWidth, touchHeight);

        }

        outInsets.contentTopInsets = touchY;

        outInsets.visibleTopInsets = touchY;
@@ -2268,6 +2272,25 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
        showOptionDialogInternal(builder.create());

    }



    private void showOptionDialogInternal(AlertDialog dialog) {

        final IBinder windowToken = KeyboardSwitcher.getInstance().getKeyboardView()

                .getWindowToken();

        if (windowToken == null) return;



        dialog.setCancelable(true);

        dialog.setCanceledOnTouchOutside(true);



        final Window window = dialog.getWindow();

        final WindowManager.LayoutParams lp = window.getAttributes();

        lp.token = windowToken;

        lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;

        window.setAttributes(lp);

        window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);



        mOptionsDialog = dialog;

        dialog.show();

    }



    @Override

    protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {

        super.dump(fd, fout, args);