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

Commit b6e398a7 authored by Tom Ouyang's avatar Tom Ouyang Committed by Android (Google) Code Review
Browse files

Merge "Refactor more keys menu framework (part 1)"

parents 2d4d64d9 fa2d5437

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

+32 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ import java.util.HashSet; 
 * @attr ref R.styleable#Keyboard_Key_keyShiftedLetterHintActivatedColor

 * @attr ref R.styleable#Keyboard_Key_keyPreviewTextColor

 */

public class KeyboardView extends View implements PointerTracker.DrawingProxy {

public class KeyboardView extends View implements PointerTracker.DrawingProxy,

        MoreKeysPanel.Controller {

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



    // XML attributes
@@ -137,6 +138,10 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
    private final PreviewPlacerView mPreviewPlacerView;

    private final int[] mOriginCoords = CoordinateUtils.newInstance();



    // More keys panel (used by both more keys keyboard and more suggestions view)

    // TODO: Consider extending to support multiple more keys panels

    protected MoreKeysPanel mMoreKeysPanel;



    // Key preview

    private static final int PREVIEW_ALPHA = 240;

    private final int mKeyPreviewLayoutId;
@@ -1013,8 +1018,34 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
        requestLayout();

    }



    @Override

    public void onShowMoreKeysPanel(final MoreKeysPanel panel) {

        if (isShowingMoreKeysPanel()) {

            onDismissMoreKeysPanel();

        }

        mMoreKeysPanel = panel;

        mPreviewPlacerView.addView(mMoreKeysPanel.getContainerView());

    }



    public boolean isShowingMoreKeysPanel() {

        return (mMoreKeysPanel != null);

    }



    @Override

    public boolean dismissMoreKeysPanel() {

        if (isShowingMoreKeysPanel()) {

            return mMoreKeysPanel.dismissMoreKeysPanel();

        }

        return false;

    }



    @Override

    public boolean onDismissMoreKeysPanel() {

        if (isShowingMoreKeysPanel()) {

            mPreviewPlacerView.removeView(mMoreKeysPanel.getContainerView());

            mMoreKeysPanel = null;

            return true;

        }

        return false;

    }

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

+5 −20
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.view.View; 
import android.view.ViewConfiguration;

import android.view.ViewGroup;

import android.view.inputmethod.InputMethodSubtype;

import android.widget.PopupWindow;



import com.android.inputmethod.accessibility.AccessibilityUtils;

import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;
@@ -136,8 +135,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
    private int mAltCodeKeyWhileTypingAnimAlpha = Constants.Color.ALPHA_OPAQUE;



    // More keys keyboard

    private PopupWindow mMoreKeysWindow;

    private MoreKeysPanel mMoreKeysPanel;

    private int mMoreKeysPanelPointerTrackerId;

    private final WeakHashMap<Key, MoreKeysPanel> mMoreKeysPanelCache =

            new WeakHashMap<Key, MoreKeysPanel>();
@@ -665,12 +662,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
            }

            mMoreKeysPanelCache.put(parentKey, moreKeysPanel);

        }

        if (mMoreKeysWindow == null) {

            mMoreKeysWindow = new PopupWindow(getContext());

            mMoreKeysWindow.setBackgroundDrawable(null);

            mMoreKeysWindow.setAnimationStyle(R.style.MoreKeysKeyboardAnimation);

        }

        mMoreKeysPanel = moreKeysPanel;

        mMoreKeysPanelPointerTrackerId = tracker.mPointerId;



        final int[] lastCoords = CoordinateUtils.newInstance();
@@ -688,12 +679,11 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
        // {@code mPreviewVisibleOffset} has been set appropriately in

        // {@link KeyboardView#showKeyPreview(PointerTracker)}.

        final int pointY = parentKey.mY + mKeyPreviewDrawParams.mPreviewVisibleOffset;

        moreKeysPanel.showMoreKeysPanel(

                this, this, pointX, pointY, mMoreKeysWindow, mKeyboardActionListener);

        moreKeysPanel.showMoreKeysPanel(this, this, pointX, pointY, mKeyboardActionListener);

        final int translatedX = moreKeysPanel.translateX(CoordinateUtils.x(lastCoords));

        final int translatedY = moreKeysPanel.translateY(CoordinateUtils.y(lastCoords));

        tracker.onShowMoreKeysPanel(translatedX, translatedY, moreKeysPanel);

        dimEntireKeyboard(true);

        dimEntireKeyboard(true /* dimmed */);

        return true;

    }
@@ -876,15 +866,10 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
    }



    @Override

    public boolean dismissMoreKeysPanel() {

        if (mMoreKeysWindow == null || !mMoreKeysWindow.isShowing()) {

            return false;

        }

        mMoreKeysWindow.dismiss();

        mMoreKeysPanel = null;

    public boolean onDismissMoreKeysPanel() {

        mMoreKeysPanelPointerTrackerId = -1;

        dimEntireKeyboard(false);

        return true;

        dimEntireKeyboard(false /* dimmed */);

        return super.onDismissMoreKeysPanel();

    }



    /**

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

+21 −17
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ package com.android.inputmethod.keyboard; 
import android.content.Context;

import android.content.res.Resources;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.View;

import android.widget.PopupWindow;



import com.android.inputmethod.keyboard.PointerTracker.DrawingProxy;

import com.android.inputmethod.keyboard.PointerTracker.TimerProxy;
@@ -154,37 +152,33 @@ public final class MoreKeysKeyboardView extends KeyboardView implements MoreKeys 


    @Override

    public void showMoreKeysPanel(final View parentView, final Controller controller,

            final int pointX, final int pointY, final PopupWindow window,

            final KeyboardActionListener listener) {

            final int pointX, final int pointY, final KeyboardActionListener listener) {

        mController = controller;

        mListener = listener;

        final View container = (View)getParent();

        final View container = getContainerView();

        final MoreKeysKeyboard pane = (MoreKeysKeyboard)getKeyboard();

        final int defaultCoordX = pane.getDefaultCoordX();

        // The coordinates of panel's left-top corner in parentView's coordinate system.

        final int x = pointX - defaultCoordX - container.getPaddingLeft();

        final int y = pointY - container.getMeasuredHeight() + container.getPaddingBottom();



        window.setContentView(container);

        window.setWidth(container.getMeasuredWidth());

        window.setHeight(container.getMeasuredHeight());

        parentView.getLocationInWindow(mCoordinates);

        window.showAtLocation(parentView, Gravity.NO_GRAVITY,

                x + CoordinateUtils.x(mCoordinates), y + CoordinateUtils.y(mCoordinates));

        // Ensure the horizontal position of the panel does not extend past the screen edges.

        final int maxX = parentView.getMeasuredWidth() - container.getMeasuredWidth();

        final int panelX = Math.max(0, Math.min(maxX, x + CoordinateUtils.x(mCoordinates)));

        final int panelY = y + CoordinateUtils.y(mCoordinates);

        container.setX(panelX);

        container.setY(panelY);



        mOriginX = x + container.getPaddingLeft();

        mOriginY = y + container.getPaddingTop();

        controller.onShowMoreKeysPanel(this);

    }



    private boolean mIsDismissing;



    @Override

    public boolean dismissMoreKeysPanel() {

        if (mIsDismissing || mController == null) return false;

        mIsDismissing = true;

        final boolean dismissed = mController.dismissMoreKeysPanel();

        mIsDismissing = false;

        return dismissed;

        if (mController == null) return false;

        return mController.onDismissMoreKeysPanel();

    }



    @Override
@@ -196,4 +190,14 @@ public final class MoreKeysKeyboardView extends KeyboardView implements MoreKeys 
    public int translateY(final int y) {

        return y - mOriginY;

    }



    @Override

    public View getContainerView() {

        return (View)getParent();

    }



    @Override

    public boolean isShowingInParent() {

        return (getContainerView().getParent() != null);

    }

}

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

+38 −11
Original line number Diff line number Diff line
@@ -17,25 +17,42 @@ 
package com.android.inputmethod.keyboard;



import android.view.View;

import android.widget.PopupWindow;



public interface MoreKeysPanel extends PointerTracker.KeyEventHandler {

    public interface Controller {

        public boolean dismissMoreKeysPanel();

        /**

         * Add the {@link MoreKeysPanel} to the target view.

         * @param panel

         */

        public void onShowMoreKeysPanel(final MoreKeysPanel panel);



        /**

         * Remove the current {@link MoreKeysPanel} to the target view.

         */

        public boolean onDismissMoreKeysPanel();

    }



    /**

     * Show more keys panel.

     * Initializes the layout and event handling of this {@link MoreKeysPanel} and calls the

     * controller's onShowMoreKeysPanel to add the panel's container view.

     *

     * @param parentView the parent view of this more keys panel

     * @param controller the controller that can dismiss this more keys panel

     * @param pointX x coordinate of this more keys panel

     * @param pointY y coordinate of this more keys panel

     * @param window PopupWindow to be used to show this more keys panel

     * @param listener the listener that will receive keyboard action from this more keys panel.

     * @param parentView the parent view of this {@link MoreKeysPanel}

     * @param controller the controller that can dismiss this {@link MoreKeysPanel}

     * @param pointX x coordinate of this {@link MoreKeysPanel}

     * @param pointY y coordinate of this {@link MoreKeysPanel}

     * @param listener the listener that will receive keyboard action from this

     * {@link MoreKeysPanel}.

     */

    public void showMoreKeysPanel(View parentView, Controller controller, int pointX, int pointY,

            PopupWindow window, KeyboardActionListener listener);

    // TODO: Currently the MoreKeysPanel is inside a container view that is added to the parent.

    // Consider the simpler approach of placing the MoreKeysPanel itself into the parent view.

    public void showMoreKeysPanel(View parentView, Controller controller, int pointX,

            int pointY, KeyboardActionListener listener);



    /**

     * Dismisses the more keys panel and calls the controller's onDismissMoreKeysPanel to remove

     * the panel's container view.

     */

    public boolean dismissMoreKeysPanel();



    /**

     * Translate X-coordinate of touch event to the local X-coordinate of this
@@ -54,4 +71,14 @@ public interface MoreKeysPanel extends PointerTracker.KeyEventHandler { 
     * @return the local Y-coordinate to this {@link MoreKeysPanel}

     */

    public int translateY(int y);



    /**

     * Return the view containing the more keys panel.

     */

    public View getContainerView();



    /**

     * Return whether the panel is currently being shown.

     */

    public boolean isShowingInParent();

}

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

+2 −1
Original line number Diff line number Diff line
@@ -77,13 +77,14 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
        public TimerProxy getTimerProxy();

    }



    public interface DrawingProxy extends MoreKeysPanel.Controller {

    public interface DrawingProxy {

        public void invalidateKey(Key key);

        public void showKeyPreview(PointerTracker tracker);

        public void dismissKeyPreview(PointerTracker tracker);

        public void showSlidingKeyInputPreview(PointerTracker tracker);

        public void dismissSlidingKeyInputPreview();

        public void showGesturePreviewTrail(PointerTracker tracker, boolean isOldestTracker);

        public boolean dismissMoreKeysPanel();

    }



    public interface TimerProxy {