Fix confusable "label" usage, use "text" instead
* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"
Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
diff --git a/java/res/xml/rowkeys_symbols1.xml b/java/res/xml/rowkeys_symbols1.xml
index f9f8bb1..6e2f92d 100644
--- a/java/res/xml/rowkeys_symbols1.xml
+++ b/java/res/xml/rowkeys_symbols1.xml
@@ -22,43 +22,43 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!label/keylabel_for_symbols_1"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_1"
- latin:moreKeys="!label/more_keys_for_symbols_1" />
+ latin:keyLabel="!text/keylabel_for_symbols_1"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_1"
+ latin:moreKeys="!text/more_keys_for_symbols_1" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_2"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_2"
- latin:moreKeys="!label/more_keys_for_symbols_2" />
+ latin:keyLabel="!text/keylabel_for_symbols_2"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_2"
+ latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_3"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_3"
- latin:moreKeys="!label/more_keys_for_symbols_3" />
+ latin:keyLabel="!text/keylabel_for_symbols_3"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_3"
+ latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_4"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_4"
- latin:moreKeys="!label/more_keys_for_symbols_4" />
+ latin:keyLabel="!text/keylabel_for_symbols_4"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_4"
+ latin:moreKeys="!text/more_keys_for_symbols_4" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_5"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_5"
- latin:moreKeys="!label/more_keys_for_symbols_5" />
+ latin:keyLabel="!text/keylabel_for_symbols_5"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_5"
+ latin:moreKeys="!text/more_keys_for_symbols_5" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_6"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_6"
- latin:moreKeys="!label/more_keys_for_symbols_6" />
+ latin:keyLabel="!text/keylabel_for_symbols_6"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_6"
+ latin:moreKeys="!text/more_keys_for_symbols_6" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_7"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_7"
- latin:moreKeys="!label/more_keys_for_symbols_7" />
+ latin:keyLabel="!text/keylabel_for_symbols_7"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_7"
+ latin:moreKeys="!text/more_keys_for_symbols_7" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_8"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_8"
- latin:moreKeys="!label/more_keys_for_symbols_8" />
+ latin:keyLabel="!text/keylabel_for_symbols_8"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_8"
+ latin:moreKeys="!text/more_keys_for_symbols_8" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_9"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_9"
- latin:moreKeys="!label/more_keys_for_symbols_9" />
+ latin:keyLabel="!text/keylabel_for_symbols_9"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_9"
+ latin:moreKeys="!text/more_keys_for_symbols_9" />
<Key
- latin:keyLabel="!label/keylabel_for_symbols_0"
- latin:additionalMoreKeys="!label/additional_more_keys_for_symbols_0"
- latin:moreKeys="!label/more_keys_for_symbols_0" />
+ latin:keyLabel="!text/keylabel_for_symbols_0"
+ latin:additionalMoreKeys="!text/additional_more_keys_for_symbols_0"
+ latin:moreKeys="!text/more_keys_for_symbols_0" />
</merge>