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

Commit 75d7fb66 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove unused argument from PopupPanel.showPanel 

Change-Id: I726b98001042c8b874113ed964b7230fdd525abe
parent 9116bf18

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

+1 −6
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { 
    private float mPreviewTextRatio;

    private int mPreviewTextSize;

    private boolean mShowKeyPreviewPopup = true;

    private int mKeyPreviewPopupDisplayedY = -1;

    private final int mDelayBeforePreview;

    private int mDelayAfterPreview;

    private ViewGroup mPreviewPlacer;
@@ -935,8 +934,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { 
            // Dismiss key preview (in this case, slide language switcher) without any delay.

            mPreviewText.setVisibility(View.INVISIBLE);

        }

        // Clear key preview display position.

        mKeyPreviewPopupDisplayedY = -1;

    }



    private void addKeyPreview(TextView keyPreview) {
@@ -999,8 +996,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { 
        getLocationInWindow(mCoordinates);

        final int previewX = keyDrawX - (previewWidth - keyDrawWidth) / 2 + mCoordinates[0];

        final int previewY = key.mY - previewHeight + mCoordinates[1] + mPreviewOffset;

        // Record key preview position to display mini-keyboard later at the same position

        mKeyPreviewPopupDisplayedY = previewY;



        // Place the key preview.

        // TODO: Adjust position of key previews which touch screen edges
@@ -1151,7 +1146,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { 
            mPopupWindow.setClippingEnabled(false);

        }

        mPopupMiniKeyboardPanel = popupPanel;

        popupPanel.showPanel(this, parentKey, tracker, mKeyPreviewPopupDisplayedY, mPopupWindow);

        popupPanel.showPanel(this, parentKey, tracker, mPopupWindow);



        invalidateAllKeys();

        return true;

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel { 


    @Override

    public void showPanel(KeyboardView parentKeyboardView, Key parentKey,

            PointerTracker tracker, int keyPreviewY, PopupWindow window) {

            PointerTracker tracker, PopupWindow window) {

        final View container = (View)getParent();

        final MiniKeyboard miniKeyboard = (MiniKeyboard)getKeyboard();

        final Keyboard parentKeyboard = parentKeyboardView.getKeyboard();

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

+1 −3
Original line number Diff line number Diff line
@@ -27,12 +27,10 @@ public interface PopupPanel { 
     * @param parentKeyboardView the parent KeyboardView that has the parent key.

     * @param parentKey the parent key that is the source of this popup panel

     * @param tracker the pointer tracker that pressesd the parent key

     * @param keyPreviewY the Y-coordinate of key preview

     * @param window PopupWindow to be used to show this popup panel

     */

    // TODO: Remove keyPreviewY from argument.

    public void showPanel(KeyboardView parentKeyboardView, Key parentKey,

            PointerTracker tracker, int keyPreviewY, PopupWindow window);

            PointerTracker tracker, PopupWindow window);



    /**

     * Check if the pointer is in siding key input mode.