diff --git a/java/res/layout/keyboard_popup.xml b/java/res/layout/mini_keyboard.xml similarity index 91% rename from java/res/layout/keyboard_popup.xml rename to java/res/layout/mini_keyboard.xml index e2508da78..6964ec5d6 100644 --- a/java/res/layout/keyboard_popup.xml +++ b/java/res/layout/mini_keyboard.xml @@ -22,9 +22,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - style="?attr/popupMiniKeyboardPanelStyle" + style="?attr/miniKeyboardPanelStyle" > - "\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d" - 9 + 9 \u064b "١" "٢" diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml index d539e0d82..17aeff7cc 100644 --- a/java/res/values-sw600dp/config.xml +++ b/java/res/values-sw600dp/config.xml @@ -39,5 +39,5 @@ 5 medium - 5 + 5 diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml index d88020952..8b4ff367e 100644 --- a/java/res/values-sw768dp/config.xml +++ b/java/res/values-sw768dp/config.xml @@ -37,7 +37,7 @@ 5 medium - 5 + 5 2 diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index bc1bb0801..734004f5a 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -22,9 +22,9 @@ - - - + + + @@ -95,7 +95,7 @@ - + @@ -153,8 +153,8 @@ - - + + @@ -180,8 +180,8 @@ - - + + diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 1c7c1a172..28cbc9549 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -67,7 +67,7 @@ 5 small - 5 + 5 diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml index acd4b3725..acbf7dfae 100644 --- a/java/res/values/donottranslate-altchars.xml +++ b/java/res/values/donottranslate-altchars.xml @@ -51,7 +51,7 @@ ¢,$,€,£,¥,₱ ":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D " "\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@" - 7 + 7 ".com" diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 7936f3c3c..eb5b749dd 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -21,12 +21,12 @@ @dimen/keyboardHeight @fraction/maxKeyboardHeight @fraction/minKeyboardHeight - @xml/kbd_popup_template + @xml/kbd_mini_keyboard_template @fraction/keyboard_top_padding @fraction/keyboard_bottom_padding @fraction/key_horizontal_gap @fraction/key_bottom_gap - @integer/config_max_popup_keyboard_column + @integer/config_max_mini_keyboard_column - @@ -213,13 +213,13 @@ 0.0 - - diff --git a/java/res/values/themes-basic-highcontrast.xml b/java/res/values/themes-basic-highcontrast.xml index 820f96216..17c06a278 100644 --- a/java/res/values/themes-basic-highcontrast.xml +++ b/java/res/values/themes-basic-highcontrast.xml @@ -19,8 +19,8 @@ @style/Keyboard @style/LatinKeyboard @style/KeyboardView.HighContrast - @style/PopupMiniKeyboardView - @style/PopupMiniKeyboardPanelStyle + @style/MiniKeyboardView + @style/MiniKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionBackgroundStyle @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/values/themes-basic.xml b/java/res/values/themes-basic.xml index 18cae4e24..23c71bd6f 100644 --- a/java/res/values/themes-basic.xml +++ b/java/res/values/themes-basic.xml @@ -19,8 +19,8 @@ @style/Keyboard @style/LatinKeyboard @style/KeyboardView - @style/PopupMiniKeyboardView - @style/PopupMiniKeyboardPanelStyle + @style/MiniKeyboardView + @style/MiniKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionBackgroundStyle @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 60f226153..1e3419f8c 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -19,8 +19,8 @@ @style/Keyboard.Gingerbread @style/LatinKeyboard @style/KeyboardView.Gingerbread - @style/PopupMiniKeyboardView.Gingerbread - @style/PopupMiniKeyboardPanelStyle + @style/MiniKeyboardView.Gingerbread + @style/MiniKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionBackgroundStyle @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml index 97c594408..7fa879cad 100644 --- a/java/res/values/themes-ics.xml +++ b/java/res/values/themes-ics.xml @@ -19,8 +19,8 @@ @style/Keyboard.IceCreamSandwich @style/LatinKeyboard.IceCreamSandwich @style/KeyboardView.IceCreamSandwich - @style/PopupMiniKeyboardView.IceCreamSandwich - @style/PopupMiniKeyboardPanelStyle.IceCreamSandwich + @style/MiniKeyboardView.IceCreamSandwich + @style/MiniKeyboardPanelStyle.IceCreamSandwich @style/SuggestionsStripBackgroundStyle.IceCreamSandwich @style/SuggestionBackgroundStyle.IceCreamSandwich @style/SuggestionPreviewBackgroundStyle.IceCreamSandwich diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml index d33e6bf35..fa2ee2dfd 100644 --- a/java/res/values/themes-stone-bold.xml +++ b/java/res/values/themes-stone-bold.xml @@ -19,8 +19,8 @@ @style/Keyboard.Stone @style/LatinKeyboard.Stone @style/KeyboardView.Stone.Bold - @style/PopupMiniKeyboardView.Stone - @style/PopupMiniKeyboardPanelStyle + @style/MiniKeyboardView.Stone + @style/MiniKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionBackgroundStyle @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml index 230b2ca4d..494bae600 100644 --- a/java/res/values/themes-stone.xml +++ b/java/res/values/themes-stone.xml @@ -19,8 +19,8 @@ @style/Keyboard.Stone @style/LatinKeyboard.Stone @style/KeyboardView.Stone - @style/PopupMiniKeyboardView.Stone - @style/PopupMiniKeyboardPanelStyle + @style/MiniKeyboardView.Stone + @style/MiniKeyboardPanelStyle @style/SuggestionsStripBackgroundStyle @style/SuggestionBackgroundStyle @style/SuggestionPreviewBackgroundStyle diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index b93d3007f..43b6623a9 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -73,7 +73,7 @@ latin:keyOutputText=":-) " latin:keyLabelOption="hasPopupHint" latin:popupCharacters="@string/alternates_for_smiley" - latin:maxPopupKeyboardColumn="5" /> + latin:maxMiniKeyboardColumn="5" /> + latin:maxMiniKeyboardColumn="5" /> diff --git a/java/res/xml/kbd_popup_template.xml b/java/res/xml/kbd_mini_keyboard_template.xml similarity index 100% rename from java/res/xml/kbd_popup_template.xml rename to java/res/xml/kbd_mini_keyboard_template.xml diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml index 75e21a002..5880d52c7 100644 --- a/java/res/xml/kbd_rows_symbols.xml +++ b/java/res/xml/kbd_rows_symbols.xml @@ -106,7 +106,7 @@ + latin:maxMiniKeyboardColumn="6" /> diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 9cf64e151..8baf3f7d1 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -93,7 +93,7 @@ public class Key { /** Popup characters */ public final CharSequence[] mPopupCharacters; /** Popup keyboard maximum column number */ - public final int mMaxPopupColumn; + public final int mMaxMiniKeyboardColumn; /** * Flags that specify the anchoring to edges of the keyboard for detecting touch events @@ -228,7 +228,7 @@ public class Key { mSticky = false; mRepeatable = false; mPopupCharacters = null; - mMaxPopupColumn = 0; + mMaxMiniKeyboardColumn = 0; mLabel = label; mOutputText = outputText; mCode = code; @@ -323,9 +323,9 @@ public class Key { } else { mPopupCharacters = popupCharacters; } - mMaxPopupColumn = style.getInt(keyboardAttr, - R.styleable.Keyboard_Key_maxPopupKeyboardColumn, - params.mMaxPopupColumn); + mMaxMiniKeyboardColumn = style.getInt(keyboardAttr, + R.styleable.Keyboard_Key_maxMiniKeyboardColumn, + params.mMaxMiniKeyboardColumn); mRepeatable = style.getBoolean(keyAttr, R.styleable.Keyboard_Key_isRepeatable, false); mFunctional = style.getBoolean(keyAttr, R.styleable.Keyboard_Key_isFunctional, false); diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java index f8e08b06a..5dabb93ec 100644 --- a/java/src/com/android/inputmethod/keyboard/Keyboard.java +++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java @@ -102,10 +102,10 @@ public class Keyboard { public final int mMostCommonKeyWidth; /** Popup keyboard template */ - public final int mPopupKeyboardResId; + public final int mPopupTemplateId; - /** Maximum column for popup keyboard */ - public final int mMaxPopupColumn; + /** Maximum column for mini keyboard */ + public final int mMaxMiniKeyboardColumn; /** True if Right-To-Left keyboard */ public final boolean mIsRtlKeyboard; @@ -130,8 +130,8 @@ public class Keyboard { mWidth = params.mWidth; mMostCommonKeyWidth = params.mMostCommonKeyWidth; mIsRtlKeyboard = params.mIsRtlKeyboard; - mPopupKeyboardResId = params.mPopupKeyboardResId; - mMaxPopupColumn = params.mMaxPopupColumn; + mPopupTemplateId = params.mPopupTemplateId; + mMaxMiniKeyboardColumn = params.mMaxMiniKeyboardColumn; mDefaultRowHeight = params.mDefaultRowHeight; mVerticalGap = params.mVerticalGap; diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 9e5e20953..4c5c2bc10 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -35,7 +35,6 @@ import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; import android.widget.RelativeLayout; import android.widget.TextView; @@ -78,7 +77,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // Miscellaneous constants private static final int[] LONG_PRESSABLE_STATE_SET = { android.R.attr.state_long_pressable }; - // XML attribute + // XML attributes + protected final float mVerticalCorrection; + protected final int mPopupLayout; private final float mBackgroundDimAmount; // HORIZONTAL ELLIPSIS "...", character for popup hint. @@ -340,6 +341,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { if (mKeyPreviewLayoutId == 0) { mShowKeyPreviewPopup = false; } + mVerticalCorrection = a.getDimensionPixelOffset( + R.styleable.KeyboardView_verticalCorrection, 0); + mPopupLayout = a.getResourceId(R.styleable.KeyboardView_popupLayout, 0); mBackgroundDimAmount = a.getFloat(R.styleable.KeyboardView_backgroundDimAmount, 0.5f); a.recycle(); diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index 85084847d..1e7ec9ead 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -19,7 +19,6 @@ package com.android.inputmethod.keyboard; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.content.res.TypedArray; import android.graphics.Canvas; import android.os.Message; import android.os.SystemClock; @@ -64,10 +63,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke // Timing constants private final int mKeyRepeatInterval; - // XML attribute - private final float mVerticalCorrection; - private final int mPopupLayout; - // Mini keyboard private PopupWindow mPopupWindow; private PopupPanel mPopupPanel; @@ -219,13 +214,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke mTouchScreenRegulator = new SuddenJumpingTouchEventHandler(getContext(), this); - final TypedArray a = context.obtainStyledAttributes( - attrs, R.styleable.KeyboardView, defStyle, R.style.KeyboardView); - mVerticalCorrection = a.getDimensionPixelOffset( - R.styleable.KeyboardView_verticalCorrection, 0); - mPopupLayout = a.getResourceId(R.styleable.KeyboardView_popupLayout, 0); - a.recycle(); - final Resources res = getResources(); mConfigShowMiniKeyboardAtTouchedPoint = res.getBoolean( R.bool.config_show_mini_keyboard_at_touched_point); @@ -374,11 +362,11 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke if (container == null) throw new NullPointerException(); - final PopupMiniKeyboardView miniKeyboardView = - (PopupMiniKeyboardView)container.findViewById(R.id.mini_keyboard_view); + final MiniKeyboardView miniKeyboardView = + (MiniKeyboardView)container.findViewById(R.id.mini_keyboard_view); final Keyboard parentKeyboard = getKeyboard(); final Keyboard miniKeyboard = new MiniKeyboard.Builder( - this, parentKeyboard.mPopupKeyboardResId, parentKey, parentKeyboard).build(); + this, parentKeyboard.mPopupTemplateId, parentKey, parentKeyboard).build(); miniKeyboardView.setKeyboard(miniKeyboard); container.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); @@ -454,7 +442,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke if (mPopupWindow == null) { mPopupWindow = new PopupWindow(getContext()); mPopupWindow.setBackgroundDrawable(null); - mPopupWindow.setAnimationStyle(R.style.PopupMiniKeyboardAnimation); + mPopupWindow.setAnimationStyle(R.style.MiniKeyboardAnimation); // Allow popup window to be drawn off the screen. mPopupWindow.setClippingEnabled(false); } diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java index e6045dc90..6119fa232 100644 --- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java @@ -227,8 +227,8 @@ public class MiniKeyboard extends Keyboard { mPopupCharacters = parentKey.mPopupCharacters; final int keyWidth = getMaxKeyWidth(view, mPopupCharacters, mParams.mDefaultKeyWidth); - mParams.setParameters(mPopupCharacters.length, parentKey.mMaxPopupColumn, keyWidth, - parentKeyboard.mDefaultRowHeight, parentKey.mX + mParams.setParameters(mPopupCharacters.length, parentKey.mMaxMiniKeyboardColumn, + keyWidth, parentKeyboard.mDefaultRowHeight, parentKey.mX + (mParams.mDefaultKeyWidth - keyWidth) / 2, view.getMeasuredWidth()); } diff --git a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java similarity index 96% rename from java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java rename to java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java index 7ace46cac..065970f62 100644 --- a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java @@ -34,7 +34,7 @@ import java.util.List; * A view that renders a virtual {@link MiniKeyboard}. It handles rendering of keys and detecting * key presses and touch movements. */ -public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel { +public class MiniKeyboardView extends KeyboardView implements PopupPanel { private final int[] mCoordinates = new int[2]; private final KeyDetector mKeyDetector; @@ -128,11 +128,11 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel { } }; - public PopupMiniKeyboardView(Context context, AttributeSet attrs) { - this(context, attrs, R.attr.popupMiniKeyboardViewStyle); + public MiniKeyboardView(Context context, AttributeSet attrs) { + this(context, attrs, R.attr.miniKeyboardViewStyle); } - public PopupMiniKeyboardView(Context context, AttributeSet attrs, int defStyle) { + public MiniKeyboardView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); final TypedArray a = context.obtainStyledAttributes( diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java b/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java index c0dba4173..66dde0512 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java @@ -171,7 +171,7 @@ public class KeyStyles { readInt(keyAttr, R.styleable.Keyboard_Key_keyIcon); readInt(keyAttr, R.styleable.Keyboard_Key_keyIconPreview); readInt(keyAttr, R.styleable.Keyboard_Key_keyIconShifted); - readInt(keyAttr, R.styleable.Keyboard_Key_maxPopupKeyboardColumn); + readInt(keyAttr, R.styleable.Keyboard_Key_maxMiniKeyboardColumn); readBoolean(keyAttr, R.styleable.Keyboard_Key_isFunctional); readBoolean(keyAttr, R.styleable.Keyboard_Key_isSticky); readBoolean(keyAttr, R.styleable.Keyboard_Key_isRepeatable); diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java index f599def36..5c76facec 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java @@ -255,10 +255,10 @@ public class KeyboardBuilder { mParams.mIsRtlKeyboard = keyboardAttr.getBoolean( R.styleable.Keyboard_isRtlKeyboard, false); - mParams.mPopupKeyboardResId = keyboardAttr.getResourceId( - R.styleable.Keyboard_popupKeyboardTemplate, 0); - mParams.mMaxPopupColumn = keyAttr.getInt( - R.styleable.Keyboard_Key_maxPopupKeyboardColumn, 5); + mParams.mPopupTemplateId = keyboardAttr.getResourceId( + R.styleable.Keyboard_popupTemplate, 0); + mParams.mMaxMiniKeyboardColumn = keyAttr.getInt( + R.styleable.Keyboard_Key_maxMiniKeyboardColumn, 5); mParams.mIconsSet.loadIcons(keyboardAttr); } finally { diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java index 980115200..e748dbb94 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java @@ -49,8 +49,8 @@ public class KeyboardParams { public int mVerticalGap; public boolean mIsRtlKeyboard; - public int mPopupKeyboardResId; - public int mMaxPopupColumn; + public int mPopupTemplateId; + public int mMaxMiniKeyboardColumn; public int GRID_WIDTH; public int GRID_HEIGHT;