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

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

Merge "Refactor key preview code"

parents 9c192e1b d9786ce2

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

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha 


        makeSymbolsKeyboardIds(id.mMode, attribute);

        mCurrentId = id;

        mInputView.setPreviewEnabled(mInputMethodService.getPopupOn());

        mInputView.setKeyPreviewEnabled(mInputMethodService.getPopupOn());

        setKeyboard(getKeyboard(id));

    }

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

+120 −120

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -55,14 +55,14 @@ public class LatinKeyboardView extends KeyboardView { 
    }



    @Override

    public void setPreviewEnabled(boolean previewEnabled) {

    public void setKeyPreviewEnabled(boolean previewEnabled) {

        LatinKeyboard latinKeyboard = getLatinKeyboard();

        if (latinKeyboard != null

                && (latinKeyboard.isPhoneKeyboard() || latinKeyboard.isNumberKeyboard())) {

            // Phone and number keyboard never shows popup preview (except language switch).

            super.setPreviewEnabled(false);

            super.setKeyPreviewEnabled(false);

        } else {

            super.setPreviewEnabled(previewEnabled);

            super.setKeyPreviewEnabled(previewEnabled);

        }

    }

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

+31 −23

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class PointerTrackerQueue { 
            if (t.isModifier()) {

                oldestPos++;

            } else {

                t.onUpEventForRelease(t.getLastX(), t.getLastY(), eventTime);

                t.onPhantomUpEvent(t.getLastX(), t.getLastY(), eventTime);

                queue.remove(oldestPos);

            }

        }
@@ -49,7 +49,7 @@ public class PointerTrackerQueue { 
        for (PointerTracker t : mQueue) {

            if (t == tracker)

                continue;

            t.onUpEventForRelease(t.getLastX(), t.getLastY(), eventTime);

            t.onPhantomUpEvent(t.getLastX(), t.getLastY(), eventTime);

        }

        mQueue.clear();

        if (tracker != null)