diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-05 20:48:52 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-09-05 20:48:52 -0700 |
| commit | 0e1a38b61e51395938eda7584d810cdaa3aaeed4 (patch) | |
| tree | acb8d0328177587ff23a21db0218a19b32fddb19 | |
| parent | b3091c5f388359f3c614534f87f98e5181f13a6f (diff) | |
| parent | 1c6b9582f400fcbe2f3dfa08ecbfbbc974a210e7 (diff) | |
| download | latinime-0e1a38b61e51395938eda7584d810cdaa3aaeed4.tar.gz latinime-0e1a38b61e51395938eda7584d810cdaa3aaeed4.tar.xz latinime-0e1a38b61e51395938eda7584d810cdaa3aaeed4.zip | |
am 1c6b9582: Merge "Rename key_space -> key_space_5kw"
* commit '1c6b9582f400fcbe2f3dfa08ecbfbbc974a210e7':
Rename key_space -> key_space_5kw
| -rw-r--r-- | java/res/xml-sw600dp/key_space_5kw.xml (renamed from java/res/xml-sw600dp/key_space.xml) | 0 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/row_dvorak4.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/row_qwerty4.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/row_symbols4.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/row_symbols_shift4.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_space_5kw.xml (renamed from java/res/xml/key_space.xml) | 0 | ||||
| -rw-r--r-- | java/res/xml/row_dvorak4.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/row_qwerty4.xml | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/java/res/xml-sw600dp/key_space.xml b/java/res/xml-sw600dp/key_space_5kw.xml index 86af89f50..86af89f50 100644 --- a/java/res/xml-sw600dp/key_space.xml +++ b/java/res/xml-sw600dp/key_space_5kw.xml diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml index 1dfb3f462..11b403452 100644 --- a/java/res/xml-sw600dp/row_dvorak4.xml +++ b/java/res/xml-sw600dp/row_dvorak4.xml @@ -34,7 +34,7 @@ latin:keyboardLayout="@xml/key_f1" /> <include latin:keyXPos="28.0%p" - latin:keyboardLayout="@xml/key_space" + latin:keyboardLayout="@xml/key_space_5kw" latin:backgroundType="normal" /> <include latin:keyboardLayout="@xml/key_question_exclamation" /> diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml index 16d373108..7969dd8a5 100644 --- a/java/res/xml-sw600dp/row_qwerty4.xml +++ b/java/res/xml-sw600dp/row_qwerty4.xml @@ -34,7 +34,7 @@ latin:keyboardLayout="@xml/key_f1" /> <include latin:keyXPos="28.0%p" - latin:keyboardLayout="@xml/key_space" + latin:keyboardLayout="@xml/key_space_5kw" latin:backgroundType="normal" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> diff --git a/java/res/xml-sw600dp/row_symbols4.xml b/java/res/xml-sw600dp/row_symbols4.xml index f138d8ef4..6db090f46 100644 --- a/java/res/xml-sw600dp/row_symbols4.xml +++ b/java/res/xml-sw600dp/row_symbols4.xml @@ -34,7 +34,7 @@ latin:keyboardLayout="@xml/key_f1" /> <include latin:keyXPos="28.0%p" - latin:keyboardLayout="@xml/key_space" + latin:keyboardLayout="@xml/key_space_5kw" latin:backgroundType="normal" /> <Key latin:keyLabel=""" diff --git a/java/res/xml-sw600dp/row_symbols_shift4.xml b/java/res/xml-sw600dp/row_symbols_shift4.xml index 29befa92a..311131eca 100644 --- a/java/res/xml-sw600dp/row_symbols_shift4.xml +++ b/java/res/xml-sw600dp/row_symbols_shift4.xml @@ -31,7 +31,7 @@ <!-- Here is empty space. --> <include latin:keyXPos="28.0%p" - latin:keyboardLayout="@xml/key_space" + latin:keyboardLayout="@xml/key_space_5kw" latin:backgroundType="normal" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> <Spacer diff --git a/java/res/xml/key_space.xml b/java/res/xml/key_space_5kw.xml index 02ee42fd2..02ee42fd2 100644 --- a/java/res/xml/key_space.xml +++ b/java/res/xml/key_space_5kw.xml diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml index e6d487e1d..02a95acea 100644 --- a/java/res/xml/row_dvorak4.xml +++ b/java/res/xml/row_dvorak4.xml @@ -65,7 +65,7 @@ </switch> <include latin:keyXPos="25%p" - latin:keyboardLayout="@xml/key_space" /> + latin:keyboardLayout="@xml/key_space_5kw" /> <Key latin:keyLabel="z" latin:keyLabelFlags="hasPopupHint" diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index e6a507435..340beb99b 100644 --- a/java/res/xml/row_qwerty4.xml +++ b/java/res/xml/row_qwerty4.xml @@ -31,7 +31,7 @@ latin:keyboardLayout="@xml/key_f1" /> <include latin:keyXPos="25%p" - latin:keyboardLayout="@xml/key_space" /> + latin:keyboardLayout="@xml/key_space_5kw" /> <switch> <case latin:languageCode="ar|fa" |