From 5f89fbaea27666b6d7892e5ac48f40201922c06b Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 12 Oct 2011 11:55:30 +0900
Subject: [PATCH] Get rid of daggers from Arabic/Hebrew keyboard

Bug: 5445200

Change-Id: I5e4e19a17b0edcd0c0de8fa8fe4289b0ca7d66b1
---
 .../values-ar/donottranslate-more-keys.xml    |  1 +
 .../values-iw/donottranslate-more-keys.xml    | 23 +++++++++++++++++++
 java/res/values/donottranslate-more-keys.xml  |  2 ++
 java/res/xml-sw600dp/kbd_rows_symbols.xml     |  4 ++--
 java/res/xml-sw768dp/kbd_rows_symbols.xml     |  4 ++--
 java/res/xml/kbd_rows_symbols.xml             |  4 ++--
 6 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 java/res/values-iw/donottranslate-more-keys.xml

diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml
index c63a9574a..2596be05d 100644
--- a/java/res/values-ar/donottranslate-more-keys.xml
+++ b/java/res/values-ar/donottranslate-more-keys.xml
@@ -75,4 +75,5 @@
     <string name="more_keys_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string>
     <string name="more_keys_for_dash">"\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string>
     <string name="more_keys_for_bullet">♪</string>
+    <string name="more_keys_for_star">★</string>
 </resources>
diff --git a/java/res/values-iw/donottranslate-more-keys.xml b/java/res/values-iw/donottranslate-more-keys.xml
new file mode 100644
index 000000000..829486f7b
--- /dev/null
+++ b/java/res/values-iw/donottranslate-more-keys.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="more_keys_for_star">★</string>
+    <string name="more_keys_for_plus">±,﬩</string>
+</resources>
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index b610412fa..6322adc49 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -97,4 +97,6 @@
     <string name="more_keys_for_apostrophe">\"</string>
     <string name="more_keys_for_dash">_</string>
     <string name="more_keys_for_bullet">♪,♥,♠,♦,♣</string>
+    <string name="more_keys_for_star">†,‡,★</string>
+    <string name="more_keys_for_plus">±</string>
 </resources>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/kbd_rows_symbols.xml
index d3513c9c6..bb48fe734 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols.xml
@@ -78,13 +78,13 @@
             latin:keyLabel="&amp;" />
         <Key
             latin:keyLabel="*"
-            latin:moreKeys="†,‡,★" />
+            latin:moreKeys="@string/more_keys_for_star" />
         <Key
             latin:keyLabel="-"
             latin:moreKeys="_,–,—" />
         <Key
             latin:keyLabel="+"
-            latin:moreKeys="±" />
+            latin:moreKeys="@string/more_keys_for_plus" />
         <Key
             latin:keyLabel="("
             latin:moreKeys="[,{,&lt;" />
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/kbd_rows_symbols.xml
index fd18a2a76..987b10cdc 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw768dp/kbd_rows_symbols.xml
@@ -85,13 +85,13 @@
             latin:keyLabel="&amp;" />
         <Key
             latin:keyLabel="*"
-            latin:moreKeys="†,‡,★" />
+            latin:moreKeys="@string/more_keys_for_star" />
         <Key
             latin:keyLabel="-"
             latin:moreKeys="_,–,—" />
         <Key
             latin:keyLabel="+"
-            latin:moreKeys="±" />
+            latin:moreKeys="@string/more_keys_for_plus" />
         <Key
             latin:keyLabel="("
             latin:moreKeys="[,{,&lt;" />
diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml
index 2235f4d56..074db5023 100644
--- a/java/res/xml/kbd_rows_symbols.xml
+++ b/java/res/xml/kbd_rows_symbols.xml
@@ -76,13 +76,13 @@
             latin:keyLabel="&amp;" />
         <Key
             latin:keyLabel="*"
-            latin:moreKeys="†,‡,★" />
+            latin:moreKeys="@string/more_keys_for_star" />
         <Key
             latin:keyLabel="-"
             latin:moreKeys="_,–,—" />
         <Key
             latin:keyLabel="+"
-            latin:moreKeys="±" />
+            latin:moreKeys="@string/more_keys_for_plus" />
         <Key
             latin:keyLabel="("
             latin:moreKeys="[,{,&lt;" />