From 33aa6e3cf0cdc94f843b5bbe18265e98e81cc4a3 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 29 Oct 2012 19:43:37 +0900
Subject: [PATCH] Escape "#" sign in XML file
Change-Id: Icd38abc4a0454ca949613d8c4bb528758cd990d8
---
java/res/xml-sw600dp/rowkeys_pcqwerty1.xml | 4 ++--
java/res/xml-sw600dp/rowkeys_symbols2.xml | 6 +++---
java/res/xml-sw600dp/rows_number_normal.xml | 2 +-
java/res/xml-sw600dp/rows_phone.xml | 2 +-
java/res/xml-sw768dp/rows_number_normal.xml | 2 +-
java/res/xml-sw768dp/rows_phone.xml | 2 +-
java/res/xml/keys_pcqwerty_symbols1.xml | 2 +-
java/res/xml/rowkeys_pcqwerty1.xml | 2 +-
java/res/xml/rowkeys_symbols2.xml | 6 +++---
java/res/xml/rows_phone_symbols.xml | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index d486b9df05..b11bbba1b0 100644
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -52,8 +52,8 @@
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="3"
- latin:keyHintLabel="#"
- latin:additionalMoreKeys="#"
+ latin:keyHintLabel="\#"
+ latin:additionalMoreKeys="\#"
latin:moreKeys="!text/more_keys_for_symbols_3"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
diff --git a/java/res/xml-sw600dp/rowkeys_symbols2.xml b/java/res/xml-sw600dp/rowkeys_symbols2.xml
index d7067e0cfe..7d7dcfe31c 100644
--- a/java/res/xml-sw600dp/rowkeys_symbols2.xml
+++ b/java/res/xml-sw600dp/rowkeys_symbols2.xml
@@ -34,7 +34,7 @@
</case>
<default>
<Key
- latin:keyLabel="#" />
+ latin:keyLabel="\#" />
</default>
</switch>
<Key
@@ -49,9 +49,9 @@
<!-- U+066B: "Ù«" ARABIC DECIMAL SEPARATOR -->
<Key
latin:keyLabel="٫"
- latin:keyHintLabel="#"
+ latin:keyHintLabel="\#"
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
- latin:moreKeys="#" />
+ latin:moreKeys="\#" />
</case>
<default>
<Key
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index f692394566..37bf2e8087 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -151,7 +151,7 @@
latin:keyLabel="0"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="#"
+ latin:keyLabel="\#"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index dcc4fde7d2..c4799bbcd8 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -116,7 +116,7 @@
<Key
latin:keyStyle="num0KeyStyle" />
<Key
- latin:keyLabel="#"
+ latin:keyLabel="\#"
latin:keyStyle="numKeyStyle" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp/rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml
index d4d7c722af..de49aba913 100644
--- a/java/res/xml-sw768dp/rows_number_normal.xml
+++ b/java/res/xml-sw768dp/rows_number_normal.xml
@@ -166,7 +166,7 @@
latin:keyLabel="0"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="#"
+ latin:keyLabel="\#"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
diff --git a/java/res/xml-sw768dp/rows_phone.xml b/java/res/xml-sw768dp/rows_phone.xml
index 2f718db627..d06a63b2ce 100644
--- a/java/res/xml-sw768dp/rows_phone.xml
+++ b/java/res/xml-sw768dp/rows_phone.xml
@@ -132,7 +132,7 @@
<Key
latin:keyStyle="num0KeyStyle" />
<Key
- latin:keyLabel="#"
+ latin:keyLabel="\#"
latin:keyStyle="numKeyStyle" />
</Row>
</merge>
diff --git a/java/res/xml/keys_pcqwerty_symbols1.xml b/java/res/xml/keys_pcqwerty_symbols1.xml
index bf48b1f17c..2364e10873 100644
--- a/java/res/xml/keys_pcqwerty_symbols1.xml
+++ b/java/res/xml/keys_pcqwerty_symbols1.xml
@@ -32,7 +32,7 @@
<Key
latin:keyLabel="\@" />
<Key
- latin:keyLabel="#" />
+ latin:keyLabel="\#" />
<Key
latin:keyLabel="$" />
<!-- U+2030: "‰" PER MILLE SIGN -->
diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml
index 0ecda35507..b2d1d374b7 100644
--- a/java/res/xml/rowkeys_pcqwerty1.xml
+++ b/java/res/xml/rowkeys_pcqwerty1.xml
@@ -41,7 +41,7 @@
latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key
latin:keyLabel="3"
- latin:additionalMoreKeys="#"
+ latin:additionalMoreKeys="\#"
latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key
latin:keyLabel="4"
diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml
index 425e20470e..d3c1278dac 100644
--- a/java/res/xml/rowkeys_symbols2.xml
+++ b/java/res/xml/rowkeys_symbols2.xml
@@ -33,14 +33,14 @@
latin:moreKeys="\@" />
<Key
latin:keyLabel="٫"
- latin:keyHintLabel="#"
- latin:moreKeys="#" />
+ latin:keyHintLabel="\#"
+ latin:moreKeys="\#" />
</case>
<default>
<Key
latin:keyLabel="\@" />
<Key
- latin:keyLabel="#" />
+ latin:keyLabel="\#" />
</default>
</switch>
<Key
diff --git a/java/res/xml/rows_phone_symbols.xml b/java/res/xml/rows_phone_symbols.xml
index c13018e7c3..8c10a2d71a 100644
--- a/java/res/xml/rows_phone_symbols.xml
+++ b/java/res/xml/rows_phone_symbols.xml
@@ -65,7 +65,7 @@
<Key
latin:keyStyle="numWaitKeyStyle" />
<Key
- latin:keyLabel="#"
+ latin:keyLabel="\#"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
--
GitLab