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

am 964877a8: am c297197b: am 1c2cf719: Add new value "spacebar" to Key.backgroundType attribute 

* commit '964877a8f29aaeda32b50bb829186ce88b2de2e0':
  Add new value "spacebar" to Key.backgroundType attribute
main
Tadashi G. Takaoka 2014-09-03 18:08:43 +00:00 committed by Android Git Automerger
parent 00415b0072 964877a8f2
commit 342dee90e4
8 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,6 +284,7 @@
<enum name="stickyOff" value="3" />
<enum name="stickyOn" value="4" />
<enum name="action" value="5" />
<enum name="spacebar" value="6" />
</attr>
<!-- The key action flags. -->
<attr name="keyActionFlags" format="integer">

1
java/res/xml-sw600dp/key_styles_common.xml
View File

@ -86,6 +86,7 @@
<key-style
latin:styleName="spaceKeyStyle"
latin:keySpec="!icon/space_key|!code/key_space"
latin:backgroundType="spacebar"
latin:keyActionFlags="noKeyPreview|enableLongPress" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->

5
java/res/xml-sw600dp/rows_number_normal.xml
View File

@ -141,9 +141,8 @@
</Row>
<Row>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p"
latin:backgroundType="functional" />
latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" />
<Key
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" />

5
java/res/xml-sw600dp/rows_phone.xml
View File

@ -107,9 +107,8 @@
</Row>
<Row>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p"
latin:backgroundType="functional" />
latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" />
<Key
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" />

1
java/res/xml/key_space_symbols.xml
View File

@ -22,7 +22,6 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:backgroundType="normal"
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" />
</merge>

1
java/res/xml/key_styles_common.xml
View File

@ -91,6 +91,7 @@
<key-style
latin:styleName="spaceKeyStyle"
latin:keySpec="!icon/space_key|!code/key_space"
latin:backgroundType="spacebar"
latin:keyActionFlags="noKeyPreview|enableLongPress" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->

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

@ -123,4 +123,24 @@
latin:keyLabelFlags="alignIconToBottom"
latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" />
<!-- TODO: Consolidate these space key styles with numSpaceKeyStyle above by introducing <case>
predicator that checks device form-factor. -->
<switch>
<case latin:keyboardTheme="ICS|KLP">
<key-style
latin:styleName="tabletNumSpaceKeyStyle"
latin:keySpec="!icon/space_key|!code/key_space"
latin:backgroundType="functional"
latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" />
</case>
<case latin:keyboardTheme="LXXLight|LXXDark">
<key-style
latin:styleName="tabletNumSpaceKeyStyle"
latin:keySpec="!icon/space_key|!code/key_space"
latin:backgroundType="spacebar"
latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" />
</case>
</switch>
</merge>

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

@ -139,6 +139,7 @@ public class Key implements Comparable<Key> {
public static final int BACKGROUND_TYPE_STICKY_OFF = 3;
public static final int BACKGROUND_TYPE_STICKY_ON = 4;
public static final int BACKGROUND_TYPE_ACTION = 5;
public static final int BACKGROUND_TYPE_SPACEBAR = 6;
private final int mActionFlags;
private static final int ACTION_FLAGS_IS_REPEATABLE = 0x01;
@ -505,6 +506,7 @@ public class Key implements Comparable<Key> {
case BACKGROUND_TYPE_STICKY_OFF: return "stickyOff";
case BACKGROUND_TYPE_STICKY_ON: return "stickyOn";
case BACKGROUND_TYPE_ACTION: return "action";
case BACKGROUND_TYPE_SPACEBAR: return "spacebar";
default: return null;
}
}
@ -887,6 +889,8 @@ public class Key implements Comparable<Key> {
new KeyBackgroundState(android.R.attr.state_checkable, android.R.attr.state_checked),
// 5: BACKGROUND_TYPE_ACTION
new KeyBackgroundState(android.R.attr.state_active),
// 6: BACKGROUND_TYPE_SPACEBAR
new KeyBackgroundState(),
};
}
@ -900,7 +904,7 @@ public class Key implements Comparable<Key> {
final Drawable background;
if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL) {
background = functionalKeyBackground;
} else if (getCode() == Constants.CODE_SPACE) {
} else if (mBackgroundType == BACKGROUND_TYPE_SPACEBAR) {
background = spacebarBackground;
} else {
background = keyBackground;