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

Commit 3ff72dd0 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Consolidate 3 public methods of key preview into one 

Change-Id: I0ac92c56bdb636998f7f5e20fba6830b4ac435fa
parent 4c45fff2

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.view.inputmethod.InputMethodSubtype;

import android.view.inputmethod.InputMethodSubtype;

import android.widget.TextView;





import com.android.inputmethod.accessibility.AccessibilityUtils;

import com.android.inputmethod.accessibility.AccessibilityUtils;

import com.android.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;

import com.android.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;
@@ -461,12 +460,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
        }

        }





        locatePreviewPlacerView();

        locatePreviewPlacerView();

        final TextView previewTextView = mKeyPreviewChoreographer.getKeyPreviewTextView(

                key, mDrawingPreviewPlacerView);

        getLocationInWindow(mOriginCoords);

        getLocationInWindow(mOriginCoords);

        mKeyPreviewChoreographer.placeKeyPreview(key, previewTextView, keyboard.mIconsSet,

        mKeyPreviewChoreographer.placeKeyPreviewAndShow(key, keyboard.mIconsSet, mKeyDrawParams,

                mKeyDrawParams, getWidth(), mOriginCoords);

                getWidth(), mOriginCoords, mDrawingPreviewPlacerView, isHardwareAccelerated());

        mKeyPreviewChoreographer.showKeyPreview(key, previewTextView, isHardwareAccelerated());

    }

    }





    // Implements {@link TimerHandler.Callbacks} method.

    // Implements {@link TimerHandler.Callbacks} method.

java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java

+12 −3
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ public final class KeyPreviewChoreographer { 
        mParams = params;

        mParams = params;

    }

    }





    public TextView getKeyPreviewTextView(final Key key, final ViewGroup placerView) {

    private TextView getKeyPreviewTextView(final Key key, final ViewGroup placerView) {

        TextView previewTextView = mShowingKeyPreviewTextViews.remove(key);

        TextView previewTextView = mShowingKeyPreviewTextViews.remove(key);

        if (previewTextView != null) {

        if (previewTextView != null) {

            return previewTextView;

            return previewTextView;
@@ -134,7 +134,16 @@ public final class KeyPreviewChoreographer { 
    private static final int STATE_NORMAL = 0;

    private static final int STATE_NORMAL = 0;

    private static final int STATE_HAS_MOREKEYS = 1;

    private static final int STATE_HAS_MOREKEYS = 1;





    public void placeKeyPreview(final Key key, final TextView previewTextView,

    public void placeKeyPreviewAndShow(final Key key, final KeyboardIconsSet iconsSet,

            final KeyDrawParams drawParams, final int keyboardViewWidth, final int[] keyboardOrigin,

            final ViewGroup placerView, final boolean withAnimation) {

        final TextView previewTextView = getKeyPreviewTextView(key, placerView);

        placeKeyPreview(

                key, previewTextView, iconsSet, drawParams, keyboardViewWidth, keyboardOrigin);

        showKeyPreview(key, previewTextView, withAnimation);

    }



    private void placeKeyPreview(final Key key, final TextView previewTextView,

            final KeyboardIconsSet iconsSet, final KeyDrawParams drawParams,

            final KeyboardIconsSet iconsSet, final KeyDrawParams drawParams,

            final int keyboardViewWidth, final int[] originCoords) {

            final int keyboardViewWidth, final int[] originCoords) {

        previewTextView.setTextColor(drawParams.mPreviewTextColor);

        previewTextView.setTextColor(drawParams.mPreviewTextColor);
@@ -189,7 +198,7 @@ public final class KeyPreviewChoreographer { 
        previewTextView.setPivotY(previewHeight);

        previewTextView.setPivotY(previewHeight);

    }

    }





    public void showKeyPreview(final Key key, final TextView previewTextView,

    private void showKeyPreview(final Key key, final TextView previewTextView,

            final boolean withAnimation) {

            final boolean withAnimation) {

        if (!withAnimation) {

        if (!withAnimation) {

            previewTextView.setVisibility(View.VISIBLE);

            previewTextView.setVisibility(View.VISIBLE);