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

Commit 4e1dab8c authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Move KeyboardBuilder and KeyboardParams classes into Keyboard class 

This change also moves XmlParseUtils to com.android.inputmethod.latin package.

Bug: 5778201
Change-Id: I7d9faa344460753ce178ad4048e0fadb65c75614
parent 3708787f

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

+14 −16
Original line number Diff line number Diff line
@@ -27,12 +27,10 @@ import android.util.Xml; 


import com.android.inputmethod.keyboard.internal.KeyStyles;

import com.android.inputmethod.keyboard.internal.KeyStyles.KeyStyle;

import com.android.inputmethod.keyboard.internal.KeyboardBuilder;

import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;

import com.android.inputmethod.keyboard.internal.KeyboardParams;

import com.android.inputmethod.keyboard.internal.MoreKeySpecParser;

import com.android.inputmethod.keyboard.internal.XmlParseUtils;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.XmlParseUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -160,19 +158,19 @@ public class Key { 
        }

    }



    private static int getCode(Resources res, KeyboardParams params, String moreKeySpec) {

    private static int getCode(Resources res, Keyboard.Params params, String moreKeySpec) {

        return getRtlParenthesisCode(

                MoreKeySpecParser.getCode(res, moreKeySpec), params.mIsRtlKeyboard);

    }



    private static Drawable getIcon(KeyboardParams params, String moreKeySpec) {

    private static Drawable getIcon(Keyboard.Params params, String moreKeySpec) {

        return params.mIconsSet.getIcon(MoreKeySpecParser.getIconId(moreKeySpec));

    }



    /**

     * This constructor is being used only for key in more keys keyboard.

     */

    public Key(Resources res, KeyboardParams params, String moreKeySpec,

    public Key(Resources res, Keyboard.Params params, String moreKeySpec,

            int x, int y, int width, int height) {

        this(params, MoreKeySpecParser.getLabel(moreKeySpec), null, getIcon(params, moreKeySpec),

                getCode(res, params, moreKeySpec), MoreKeySpecParser.getOutputText(moreKeySpec),
@@ -182,7 +180,7 @@ public class Key { 
    /**

     * This constructor is being used only for key in popup suggestions pane.

     */

    public Key(KeyboardParams params, CharSequence label, CharSequence hintLabel, Drawable icon,

    public Key(Keyboard.Params params, CharSequence label, CharSequence hintLabel, Drawable icon,

            int code, CharSequence outputText, int x, int y, int width, int height) {

        mHeight = height - params.mVerticalGap;

        mHorizontalGap = params.mHorizontalGap;
@@ -220,7 +218,7 @@ public class Key { 
     * @param keyStyles active key styles set

     * @throws XmlPullParserException

     */

    public Key(Resources res, KeyboardParams params, KeyboardBuilder.Row row,

    public Key(Resources res, Keyboard.Params params, Keyboard.Builder.Row row,

            XmlPullParser parser, KeyStyles keyStyles) throws XmlPullParserException {

        final float horizontalGap = isSpacer() ? 0 : params.mHorizontalGap;

        final int keyHeight = row.mRowHeight;
@@ -272,9 +270,9 @@ public class Key { 
        mActionFlags = style.getFlag(keyAttr, R.styleable.Keyboard_Key_keyActionFlags, 0);



        final KeyboardIconsSet iconsSet = params.mIconsSet;

        mVisualInsetsLeft = (int) KeyboardBuilder.getDimensionOrFraction(keyAttr,

        mVisualInsetsLeft = (int) Keyboard.Builder.getDimensionOrFraction(keyAttr,

                R.styleable.Keyboard_Key_visualInsetsLeft, params.mBaseWidth, 0);

        mVisualInsetsRight = (int) KeyboardBuilder.getDimensionOrFraction(keyAttr,

        mVisualInsetsRight = (int) Keyboard.Builder.getDimensionOrFraction(keyAttr,

                R.styleable.Keyboard_Key_visualInsetsRight, params.mBaseWidth, 0);

        mPreviewIcon = iconsSet.getIcon(style.getInt(keyAttr,

                R.styleable.Keyboard_Key_keyIconPreview, KeyboardIconsSet.ICON_UNDEFINED));
@@ -355,19 +353,19 @@ public class Key { 
        return o instanceof Key && equals((Key)o);

    }



    public void markAsLeftEdge(KeyboardParams params) {

    public void markAsLeftEdge(Keyboard.Params params) {

        mHitBox.left = params.mHorizontalEdgesPadding;

    }



    public void markAsRightEdge(KeyboardParams params) {

    public void markAsRightEdge(Keyboard.Params params) {

        mHitBox.right = params.mOccupiedWidth - params.mHorizontalEdgesPadding;

    }



    public void markAsTopEdge(KeyboardParams params) {

    public void markAsTopEdge(Keyboard.Params params) {

        mHitBox.top = params.mTopPadding;

    }



    public void markAsBottomEdge(KeyboardParams params) {

    public void markAsBottomEdge(Keyboard.Params params) {

        mHitBox.bottom = params.mOccupiedHeight + params.mBottomPadding;

    }
@@ -603,7 +601,7 @@ public class Key { 
    }



    public static class Spacer extends Key {

        public Spacer(Resources res, KeyboardParams params, KeyboardBuilder.Row row,

        public Spacer(Resources res, Keyboard.Params params, Keyboard.Builder.Row row,

                XmlPullParser parser, KeyStyles keyStyles) throws XmlPullParserException {

            super(res, params, row, parser, keyStyles);

        }
@@ -611,7 +609,7 @@ public class Key { 
        /**

         * This constructor is being used only for divider in more keys keyboard.

         */

        public Spacer(KeyboardParams params, Drawable icon, int x, int y, int width, int height) {

        public Spacer(Keyboard.Params params, Drawable icon, int x, int y, int width, int height) {

            super(params, null, null, icon, Keyboard.CODE_DUMMY, null, x, y, width, height);

        }

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

+981 −2

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −5
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ import android.util.Log; 
import android.util.Xml;

import android.view.inputmethod.EditorInfo;



import com.android.inputmethod.keyboard.internal.KeyboardBuilder;

import com.android.inputmethod.keyboard.internal.KeyboardParams;

import com.android.inputmethod.keyboard.internal.XmlParseUtils;

import com.android.inputmethod.latin.LatinIME;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.LocaleUtils;
@@ -34,6 +31,7 @@ import com.android.inputmethod.latin.R; 
import com.android.inputmethod.latin.SettingsValues;

import com.android.inputmethod.latin.SubtypeSwitcher;

import com.android.inputmethod.latin.Utils;

import com.android.inputmethod.latin.XmlParseUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -125,8 +123,8 @@ public class KeyboardSet { 
        if (keyboard == null) {

            final Locale savedLocale = LocaleUtils.setSystemLocale(res, id.mLocale);

            try {

                final KeyboardBuilder<KeyboardParams> builder =

                        new KeyboardBuilder<KeyboardParams>(context, new KeyboardParams());

                final Keyboard.Builder<Keyboard.Params> builder =

                        new Keyboard.Builder<Keyboard.Params>(context, new Keyboard.Params());

                builder.load(xmlId, id);

                builder.setTouchPositionCorrectionEnabled(

                        subtypeSwitcher.currentSubtypeContainsExtraValueKey(

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

+2 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.inputmethod.keyboard; 


import android.graphics.Paint;



import com.android.inputmethod.keyboard.internal.KeyboardBuilder;

import com.android.inputmethod.keyboard.internal.KeyboardParams;

import com.android.inputmethod.keyboard.internal.MoreKeySpecParser;

import com.android.inputmethod.latin.R;
@@ -35,10 +33,10 @@ public class MiniKeyboard extends Keyboard { 
        return mDefaultKeyCoordX;

    }



    public static class Builder extends KeyboardBuilder<Builder.MiniKeyboardParams> {

    public static class Builder extends Keyboard.Builder<Builder.MiniKeyboardParams> {

        private final CharSequence[] mMoreKeys;



        public static class MiniKeyboardParams extends KeyboardParams {

        public static class MiniKeyboardParams extends Keyboard.Params {

            /* package */int mTopRowAdjustment;

            public int mNumRows;

            public int mNumColumns;

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.inputmethod.keyboard; 


import android.graphics.Rect;



import com.android.inputmethod.keyboard.internal.KeyboardParams.TouchPositionCorrection;

import com.android.inputmethod.keyboard.Keyboard.Params.TouchPositionCorrection;

import com.android.inputmethod.latin.Utils;

import com.android.inputmethod.latin.spellcheck.SpellCheckerProximityInfo;