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

Add language switch key to symbols and symbols shifted layout 

Bug: 6370179
Change-Id: I061559ea5d0cb11a059de4b6e741f9c17ee69a27
main
Tadashi G. Takaoka 2012-04-20 18:57:26 +09:00
parent a4b846ac73
commit 3ce085079f
10 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/res/xml-sw600dp/key_space.xml
View File

@ -21,6 +21,9 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Spacer
latin:keyWidth="0dp"
latin:keyXPos="30.750%p" />
<switch>
<case
latin:languageCode="fa"

8
java/res/xml-sw600dp/row_symbols4.xml
View File

@ -19,7 +19,7 @@
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="8.9%p"
@ -31,10 +31,8 @@
latin:keyStyle="tabKeyStyle" />
<Key
latin:keyLabel="\@" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" />
<include
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="&quot;"
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />

8
java/res/xml-sw600dp/row_symbols_shift4.xml
View File

@ -19,7 +19,7 @@
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="8.9%p"
@ -29,10 +29,8 @@
latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" />
<include
latin:keyboardLayout="@xml/key_space" />
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />

5
java/res/xml-sw768dp/key_space.xml
View File

@ -21,13 +21,15 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Spacer
latin:keyWidth="0dp"
latin:keyXPos="31.250%p" />
<switch>
<case
latin:languageCode="fa"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="29.453%p" />
<!-- U+200C: "" ZERO WIDTH NON-JOINER
U+200D: "" ZERO WIDTH JOINER -->
@ -37,7 +39,6 @@
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="37.500%p" />
</default>
</switch>

8
java/res/xml-sw768dp/row_symbols4.xml
View File

@ -19,7 +19,7 @@
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="8.047%p"
@ -31,10 +31,8 @@
latin:keyXPos="15.157%p" />
<Key
latin:keyLabel="\@" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="37.500%p" />
<include
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="&quot;"
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />

8
java/res/xml-sw768dp/row_symbols_shift4.xml
View File

@ -19,17 +19,15 @@
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="8.047%p"
>
<include
latin:keyboardLayout="@xml/key_settings" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="37.500%p" />
<include
latin:keyboardLayout="@xml/key_space" />
<switch>
<case
latin:shortcutKeyEnabled="true"

3
java/res/xml/key_space.xml
View File

@ -21,6 +21,9 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Spacer
latin:keyWidth="0dp"
latin:keyXPos="25%p" />
<switch>
<case
latin:languageCode="fa"

5
java/res/xml/row_symbols4.xml
View File

@ -43,9 +43,8 @@
latin:keyStyle="f1MoreKeysStyle" />
</default>
</switch>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
<include
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyStyle="punctuationKeyStyle" />
<Key

5
java/res/xml/row_symbols_shift4.xml
View File

@ -35,9 +35,8 @@
<Key
latin:keyLabel="&#x201E;"
latin:backgroundType="functional" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
<include
latin:keyboardLayout="@xml/key_space" />
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<Key
latin:keyLabel="&#x2026;"

7
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -313,8 +313,11 @@ public class Keyboard {
public void onAddKey(Key newKey) {
final Key key = (mKeysCache != null) ? mKeysCache.get(newKey) : newKey;
mKeys.add(key);
updateHistogram(key);
final boolean zeroWidthSpacer = key.isSpacer() && key.mWidth == 0;
if (!zeroWidthSpacer) {
mKeys.add(key);
updateHistogram(key);
}
if (key.mCode == Keyboard.CODE_SHIFT) {
mShiftKeys.add(key);
}