Rename Key.keyLabel attribute to KeySpec
Change-Id: Ida48cd9bdbc01fefad651a005084262c0f46c41c
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index 805822f..e42bda3 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -26,76 +26,76 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="+" />
+ latin:keySpec="+" />
<!-- U+0E51: "๑" THAI DIGIT ONE -->
<Key
- latin:keyLabel="๑"
+ latin:keySpec="๑"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key
- latin:keyLabel="๒"
+ latin:keySpec="๒"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E53: "๓" THAI DIGIT THREE -->
<Key
- latin:keyLabel="๓"
+ latin:keySpec="๓"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E54: "๔" THAI DIGIT FOUR -->
<Key
- latin:keyLabel="๔"
+ latin:keySpec="๔"
latin:keyLabelFlags="fontNormal" />
<!-- U+0020: " " SPACE
U+0E39: " ู" THAI CHARACTER SARA UU -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel=" ู|ู"
+ latin:keySpec=" ู|ู"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
<Key
- latin:keyLabel="฿"
+ latin:keySpec="฿"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E55: "๕" THAI DIGIT FIVE -->
<Key
- latin:keyLabel="๕"
+ latin:keySpec="๕"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E56: "๖" THAI DIGIT SIX -->
<Key
- latin:keyLabel="๖"
+ latin:keySpec="๖"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E57: "๗" THAI DIGIT SEVEN -->
<Key
- latin:keyLabel="๗"
+ latin:keySpec="๗"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E58: "๘" THAI DIGIT EIGHT -->
<Key
- latin:keyLabel="๘"
+ latin:keySpec="๘"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E59: "๙" THAI DIGIT NINE -->
<Key
- latin:keyLabel="๙"
+ latin:keySpec="๙"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
<Key
- latin:keyLabel="ๅ"
+ latin:keySpec="ๅ"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E51: "๑" THAI DIGIT ONE -->
<Key
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="๑"
- latin:keyLabel="/" />
+ latin:keySpec="/" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="๒"
- latin:keyLabel="_" />
+ latin:keySpec="_" />
<!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
U+0E53: "๓" THAI DIGIT THREE -->
<Key
- latin:keyLabel="ภ"
+ latin:keySpec="ภ"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="๓"
@@ -103,7 +103,7 @@
<!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
U+0E54: "๔" THAI DIGIT FOUR -->
<Key
- latin:keyLabel="ถ"
+ latin:keySpec="ถ"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:moreKeys="๔"
@@ -113,19 +113,19 @@
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel=" ุ|ุ"
+ latin:keySpec=" ุ|ุ"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E36: " ึ" THAI CHARACTER SARA UE -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
- latin:keyLabel=" ึ|ึ"
+ latin:keySpec=" ึ|ึ"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
U+0E55: "๕" THAI DIGIT FIVE -->
<Key
- latin:keyLabel="ค"
+ latin:keySpec="ค"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="๕"
@@ -133,7 +133,7 @@
<!-- U+0E15: "ต" THAI CHARACTER TO TAO
U+0E56: "๖" THAI DIGIT SIX -->
<Key
- latin:keyLabel="ต"
+ latin:keySpec="ต"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="๖"
@@ -141,7 +141,7 @@
<!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
U+0E57: "๗" THAI DIGIT SEVEN -->
<Key
- latin:keyLabel="จ"
+ latin:keySpec="จ"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="๗"
@@ -149,7 +149,7 @@
<!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
U+0E58: "๘" THAI DIGIT EIGHT -->
<Key
- latin:keyLabel="ข"
+ latin:keySpec="ข"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="๘"
@@ -157,7 +157,7 @@
<!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
U+0E59: "๙" THAI DIGIT NINE -->
<Key
- latin:keyLabel="ช"
+ latin:keySpec="ช"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="๙"