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

Commit a9311741 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Add KeyboardActionListener.Adapter"

parents 5406d63d e3be3bce

java/src/com/android/inputmethod/keyboard/KeyboardActionListener.java

+17 −0
Original line number Diff line number Diff line
@@ -76,4 +76,21 @@ public interface KeyboardActionListener { 
     * @return true if the request has been consumed, false otherwise.

     */

    public boolean onCustomRequest(int requestCode);



    public static class Adapter implements KeyboardActionListener {

        @Override

        public void onPress(int primaryCode, boolean withSliding) {}

        @Override

        public void onRelease(int primaryCode, boolean withSliding) {}

        @Override

        public void onCodeInput(int primaryCode, int[] keyCodes, int x, int y) {}

        @Override

        public void onTextInput(CharSequence text) {}

        @Override

        public void onCancelInput() {}

        @Override

        public boolean onCustomRequest(int requestCode) {

            return false;

        }

    }

}

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+2 −14
Original line number Diff line number Diff line
@@ -139,20 +139,8 @@ public class PointerTracker { 
    private boolean mIgnoreModifierKey;



    // Empty {@link KeyboardActionListener}

    private static final KeyboardActionListener EMPTY_LISTENER = new KeyboardActionListener() {

        @Override

        public void onPress(int primaryCode, boolean withSliding) {}

        @Override

        public void onRelease(int primaryCode, boolean withSliding) {}

        @Override

        public void onCodeInput(int primaryCode, int[] keyCodes, int x, int y) {}

        @Override

        public void onTextInput(CharSequence text) {}

        @Override

        public void onCancelInput() {}

        @Override

        public boolean onCustomRequest(int requestCode) { return false; }

    };

    private static final KeyboardActionListener EMPTY_LISTENER =

            new KeyboardActionListener.Adapter();



    public static void init(boolean hasDistinctMultitouch, Context context) {

        if (hasDistinctMultitouch) {

java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java

+2 −3
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel { 
        public void cancelKeyTimers() {}

    };



    private final KeyboardActionListener mMiniKeyboardListener = new KeyboardActionListener() {

    private final KeyboardActionListener mMiniKeyboardListener =

            new KeyboardActionListener.Adapter() {

        @Override

        public void onCodeInput(int primaryCode, int[] keyCodes, int x, int y) {

            mListener.onCodeInput(primaryCode, keyCodes, x, y);
@@ -125,8 +126,6 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel { 
        public void onRelease(int primaryCode, boolean withSliding) {

            mListener.onRelease(primaryCode, withSliding);

        }

        @Override

        public boolean onCustomRequest(int requestCode) { return false; }

    };



    public PopupMiniKeyboardView(Context context, AttributeSet attrs) {