From 0464850e6c27eaad642b9dacad44e654cab120ae Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 29 Jun 2011 18:33:49 +0900
Subject: [PATCH] Add key description for "fullwidth asterisk" used on
 phone/number layout

This change also removes non-ASCII comment from strings.xml to
suppress resource compiler warning.

Change-Id: I96d3e8e2c7072816f32a15564745f8cdc3f91ee9
---
 java/res/values/strings.xml                      | 16 ++++++++--------
 .../accessibility/KeyCodeDescriptionMapper.java  |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index a6ef5e533..8dde4baa5 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -190,25 +190,25 @@
     <string name="spoken_description_double_quote">Double quote</string>
     <!-- Spoken description for the "'" keyboard key. -->
     <string name="spoken_description_single_quote">Single quote</string>
-    <!-- Spoken description for the "•" keyboard key. -->
+    <!-- Spoken description for the "\u2022" (BULLET) keyboard key. -->
     <string name="spoken_description_dot">Dot</string>
-    <!-- Spoken description for the "√" keyboard key. -->
+    <!-- Spoken description for the "\u221a" (SQUARE ROOT) keyboard key. -->
     <string name="spoken_description_square_root">Square root</string>
-    <!-- Spoken description for the "π" keyboard key. -->
+    <!-- Spoken description for the "\u03C0" (GREEK SMALL LETTER PI) keyboard key. -->
     <string name="spoken_description_pi">Pi</string>
-    <!-- Spoken description for the "Δ" keyboard key. -->
+    <!-- Spoken description for the "\u0394" (GREEK CAPITAL LETTER DELTA) keyboard key. -->
     <string name="spoken_description_delta">Delta</string>
-    <!-- Spoken description for the "™" keyboard key. -->
+    <!-- Spoken description for the "\u2122" (TRADE MARK SIGN) keyboard key. -->
     <string name="spoken_description_trademark">Trademark</string>
-    <!-- Spoken description for the "℅" keyboard key. -->
+    <!-- Spoken description for the "\u2105" (CARE OF) keyboard key. -->
     <string name="spoken_description_care_of">Care of</string>
     <!-- Spoken description for the "*" keyboard key. -->
     <string name="spoken_description_star">Star</string>
     <!-- Spoken description for the "#" keyboard key. -->
     <string name="spoken_description_pound">Pound</string>
-    <!-- Spoken description for the "…" keyboard key. -->
+    <!-- Spoken description for the "\u2026" (HORIZONTAL ELLIPSIS) keyboard key. -->
     <string name="spoken_description_ellipsis">Ellipsis</string>
-    <!-- Spoken description for the "„" keyboard key. -->
+    <!-- Spoken description for the "\u201E" (DOUBLE LOW-9 QUOTATION MARK) keyboard key. -->
     <string name="spoken_description_low_double_quote">Low double quote</string>
 
     <!-- Voice related labels -->
diff --git a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
index a31911d60..d196c8955 100644
--- a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
+++ b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
@@ -85,6 +85,7 @@ public class KeyCodeDescriptionMapper {
         mKeyCodeMap.put((int) '\u2105', R.string.spoken_description_care_of);
         mKeyCodeMap.put((int) '\u2026', R.string.spoken_description_ellipsis);
         mKeyCodeMap.put((int) '\u201E', R.string.spoken_description_low_double_quote);
+        mKeyCodeMap.put((int) '\uFF0A', R.string.spoken_description_star);
 
         // Special non-character codes defined in Keyboard
         mKeyCodeMap.put(Keyboard.CODE_DELETE, R.string.spoken_description_delete);