nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 787e9a37: Revert "Add Key label off center attribute" 

* commit '787e9a37b41c67e8683e854538b2743a2bc8fdcd':
  Revert "Add Key label off center attribute"
main
Ken Wakasa 2014-08-07 11:47:40 +00:00 committed by Android Git Automerger
parent ef8a1be46f 787e9a37b4
commit c5ff9e4e23
7 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/res/values/attrs.xml
View File

@ -293,7 +293,7 @@
<attr name="keyLabelFlags" format="integer">
<!-- This should be aligned with Key.LABEL_FLAGS__* -->
<flag name="alignIconToBottom" value="0x04" />
<flag name="alignLabelOffCenter" value="0x08" />
<flag name="alignLeftOfCenter" value="0x08" />
<flag name="fontNormal" value="0x10" />
<flag name="fontMonoSpace" value="0x20" />
<flag name="fontDefault" value="0x30" />
@ -368,14 +368,6 @@
<attr name="keyHintLabelRatio" format="fraction" />
<!-- Size of the text for shifted letter hint, in the proportion of key height. -->
<attr name="keyShiftedLetterHintRatio" format="fraction" />
<!-- The label's horizontal offset to the center of the key. Negative is to left and
positive is to right. The value is in proportion of the width of
TypefaceUtils.KEY_LABEL_REFERENCE_CHAR. -->
<attr name="keyLabelOffCenterRatio" format="fraction" />
<!-- The hint label's horizontal offset to the center of the key. Negative is to left and
positive is to right. The value is in proportion of the width of
TypefaceUtils.KEY_LABEL_REFERENCE_CHAR. -->
<attr name="keyHintLabelOffCenterRatio" format="fraction" />
<!-- Color to use for the label in a key. -->
<attr name="keyTextColor" format="color" />
<attr name="keyTextShadowColor" format="color" />

2
java/res/values/themes-common.xml
View File

@ -41,8 +41,6 @@
<item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item>
<item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
<item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item>
<item name="keyLabelOffCenterRatio">-175%</item>
<item name="keyHintLabelOffCenterRatio">200%</item>
<item name="keyTypeface">normal</item>
<!-- A negative value to disable key text shadow layer. -->
<item name="keyTextShadowRadius">-1.0</item>

2
java/res/xml/key_styles_number.xml
View File

@ -39,7 +39,7 @@
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numberKeyStyle"
latin:keyLabelFlags="alignLabelOffCenter|hasHintLabel"
latin:keyLabelFlags="alignLeftOfCenter|hasHintLabel"
latin:parentStyle="numKeyStyle" />
<key-style
latin:styleName="num0KeyStyle"

6
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -59,7 +59,7 @@ public class Key implements Comparable<Key> {
/** Flags of the label */
private final int mLabelFlags;
private static final int LABEL_FLAGS_ALIGN_ICON_TO_BOTTOM = 0x04;
private static final int LABEL_FLAGS_ALIGN_LABEL_OFF_CENTER = 0x08;
private static final int LABEL_FLAGS_ALIGN_LEFT_OF_CENTER = 0x08;
// Font typeface specification.
private static final int LABEL_FLAGS_FONT_MASK = 0x30;
private static final int LABEL_FLAGS_FONT_NORMAL = 0x10;
@ -648,8 +648,8 @@ public class Key implements Comparable<Key> {
return (mLabelFlags & LABEL_FLAGS_ALIGN_ICON_TO_BOTTOM) != 0;
}
public final boolean isAlignLabelOffCenter() {
return (mLabelFlags & LABEL_FLAGS_ALIGN_LABEL_OFF_CENTER) != 0;
public final boolean isAlignLeftOfCenter() {
return (mLabelFlags & LABEL_FLAGS_ALIGN_LEFT_OF_CENTER) != 0;
}
public final boolean hasPopupHint() {

13
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -369,9 +369,9 @@ public class KeyboardView extends View {
final float baseline = centerY + labelCharHeight / 2.0f;
// Horizontal label text alignment
if (key.isAlignLabelOffCenter()) {
// The label is placed off center of the key. Used mainly on "phone number" layout.
positionX = centerX + params.mLabelOffCenterRatio * labelCharWidth;
if (key.isAlignLeftOfCenter()) {
// TODO: Parameterise this?
positionX = centerX - labelCharWidth * 7.0f / 4.0f;
paint.setTextAlign(Align.LEFT);
} else {
positionX = centerX;
@ -418,12 +418,15 @@ public class KeyboardView extends View {
blendAlpha(paint, params.mAnimAlpha);
final float labelCharHeight = TypefaceUtils.getReferenceCharHeight(paint);
final float labelCharWidth = TypefaceUtils.getReferenceCharWidth(paint);
final float adjustmentY = params.mHintLabelVerticalAdjustment * labelCharHeight;
final KeyVisualAttributes visualAttr = key.getVisualAttributes();
final float adjustmentY = (visualAttr == null) ? 0.0f
: visualAttr.mHintLabelVerticalAdjustment * labelCharHeight;
final float hintX, hintY;
if (key.hasHintLabel()) {
// The hint label is placed just right of the key label. Used mainly on
// "phone number" layout.
hintX = positionX + params.mHintLabelOffCenterRatio * labelCharWidth;
// TODO: Generalize the following calculations.
hintX = positionX + labelCharWidth * 2.0f;
hintY = centerY + labelCharHeight / 2.0f;
paint.setTextAlign(Align.LEFT);
} else if (key.hasShiftedLetterHint()) {

28
java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java
View File

@ -42,10 +42,6 @@ public final class KeyDrawParams {
public int mShiftedLetterHintActivatedColor;
public int mPreviewTextColor;
public float mHintLabelVerticalAdjustment;
public float mLabelOffCenterRatio;
public float mHintLabelOffCenterRatio;
public int mAnimAlpha;
public KeyDrawParams() {}
@ -72,10 +68,6 @@ public final class KeyDrawParams {
mShiftedLetterHintActivatedColor = copyFrom.mShiftedLetterHintActivatedColor;
mPreviewTextColor = copyFrom.mPreviewTextColor;
mHintLabelVerticalAdjustment = copyFrom.mHintLabelVerticalAdjustment;
mLabelOffCenterRatio = copyFrom.mLabelOffCenterRatio;
mHintLabelOffCenterRatio = copyFrom.mHintLabelOffCenterRatio;
mAnimAlpha = copyFrom.mAnimAlpha;
}
@ -111,13 +103,6 @@ public final class KeyDrawParams {
mShiftedLetterHintActivatedColor = selectColor(
attr.mShiftedLetterHintActivatedColor, mShiftedLetterHintActivatedColor);
mPreviewTextColor = selectColor(attr.mPreviewTextColor, mPreviewTextColor);
mHintLabelVerticalAdjustment = selectFloatIfNonZero(
attr.mHintLabelVerticalAdjustment, mHintLabelVerticalAdjustment);
mLabelOffCenterRatio = selectFloatIfNonZero(
attr.mLabelOffCenterRatio, mLabelOffCenterRatio);
mHintLabelOffCenterRatio = selectFloatIfNonZero(
attr.mHintLabelOffCenterRatio, mHintLabelOffCenterRatio);
}
public KeyDrawParams mayCloneAndUpdateParams(final int keyHeight,
@ -130,7 +115,7 @@ public final class KeyDrawParams {
return newParams;
}
private static int selectTextSizeFromDimensionOrRatio(final int keyHeight,
private static final int selectTextSizeFromDimensionOrRatio(final int keyHeight,
final int dimens, final float ratio, final int defaultDimens) {
if (ResourceUtils.isValidDimensionPixelSize(dimens)) {
return dimens;
@ -141,7 +126,7 @@ public final class KeyDrawParams {
return defaultDimens;
}
private static int selectTextSize(final int keyHeight, final float ratio,
private static final int selectTextSize(final int keyHeight, final float ratio,
final int defaultSize) {
if (ResourceUtils.isValidFraction(ratio)) {
return (int)(keyHeight * ratio);
@ -149,17 +134,10 @@ public final class KeyDrawParams {
return defaultSize;
}
private static int selectColor(final int attrColor, final int defaultColor) {
private static final int selectColor(final int attrColor, final int defaultColor) {
if (attrColor != 0) {
return attrColor;
}
return defaultColor;
}
private static float selectFloatIfNonZero(final float attrFloat, final float defaultFloat) {
if (attrFloat != 0) {
return attrFloat;
}
return defaultFloat;
}
}

8
java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java
View File

@ -48,8 +48,6 @@ public final class KeyVisualAttributes {
public final int mPreviewTextColor;
public final float mHintLabelVerticalAdjustment;
public final float mLabelOffCenterRatio;
public final float mHintLabelOffCenterRatio;
private static final int[] VISUAL_ATTRIBUTE_IDS = {
R.styleable.Keyboard_Key_keyTypeface,
@ -71,8 +69,6 @@ public final class KeyVisualAttributes {
R.styleable.Keyboard_Key_keyShiftedLetterHintActivatedColor,
R.styleable.Keyboard_Key_keyPreviewTextColor,
R.styleable.Keyboard_Key_keyHintLabelVerticalAdjustment,
R.styleable.Keyboard_Key_keyLabelOffCenterRatio,
R.styleable.Keyboard_Key_keyHintLabelOffCenterRatio
};
private static final SparseIntArray sVisualAttributeIds = new SparseIntArray();
private static final int ATTR_DEFINED = 1;
@ -139,9 +135,5 @@ public final class KeyVisualAttributes {
mHintLabelVerticalAdjustment = ResourceUtils.getFraction(keyAttr,
R.styleable.Keyboard_Key_keyHintLabelVerticalAdjustment, 0.0f);
mLabelOffCenterRatio = ResourceUtils.getFraction(keyAttr,
R.styleable.Keyboard_Key_keyLabelOffCenterRatio, 0.0f);
mHintLabelOffCenterRatio = ResourceUtils.getFraction(keyAttr,
R.styleable.Keyboard_Key_keyHintLabelOffCenterRatio, 0.0f);
}
}