From b1cb13292f482627e64ccb35be905b7f3154d4ff Mon Sep 17 00:00:00 2001
From: Fredrik Roubert <roubert@google.com>
Date: Wed, 3 Mar 2010 16:30:55 +0100
Subject: [PATCH] Update Swedish keyboard layout to not use external strings.

---
 java/res/values-sv/donottranslate.xml | 29 ---------------
 java/res/xml-sv/kbd_qwerty.xml        | 51 ++++++++++++++-------------
 2 files changed, 27 insertions(+), 53 deletions(-)
 delete mode 100644 java/res/values-sv/donottranslate.xml

diff --git a/java/res/values-sv/donottranslate.xml b/java/res/values-sv/donottranslate.xml
deleted file mode 100644
index 7f6f357d6..000000000
--- a/java/res/values-sv/donottranslate.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2009, 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="alternates_for_d">ðď</string>
-    <string name="alternates_for_l">ł</string>
-    <string name="alternates_for_r">ř</string>
-    <string name="alternates_for_t">ťþ</string>
-    <string name="alternates_for_v">w</string>
-    <string name="alternates_for_z">źžż</string>
-    <string name="alternates_for_ae">æ</string>
-    <string name="alternates_for_oe">øœ</string>
-</resources>
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index b98f6135a..54d7d68a9 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -19,9 +19,10 @@
 -->
 
 <!--
-    Swedish Keyboard Layout.
-    Key placement according to Svensk standard SS 66 22 41.
-    Foreign letters according to Svenska skrivregler (2:a uppl.) §302.
+    Swedish Keyboard Layout
+
+    Key positioning: Svensk standard SS 66 22 41
+    Foreign letters: Svenska skrivregler (2:a uppl.) §302
     Local additions: ۧ
 -->
 
@@ -38,40 +39,41 @@
         <Key android:codes="119" android:keyLabel="w"/>
         <Key android:codes="101" android:keyLabel="e"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_e"/>
+                android:popupCharacters="éèêëę€"/>
         <Key android:codes="114" android:keyLabel="r"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_r"/>
+                android:popupCharacters="ř"/>
         <Key android:codes="116" android:keyLabel="t"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_t"/>
+                android:popupCharacters="ťþ"/>
         <Key android:codes="121" android:keyLabel="y"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_y"/>
+                android:popupCharacters="ýÿü"/>
         <Key android:codes="117" android:keyLabel="u"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_u"/>
+                android:popupCharacters="úùûū"/>
         <Key android:codes="105" android:keyLabel="i"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_i"/>
+                android:popupCharacters="íìîï"/>
         <Key android:codes="111" android:keyLabel="o"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_o"/>
+                android:popupCharacters="óòôõ"/>
         <Key android:codes="112" android:keyLabel="p"/>
-        <Key android:keyLabel="å" android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+        <Key android:keyLabel="å"
+                android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
     </Row>
 
     <Row>
-        <Key android:codes="97" android:keyLabel="a" android:keyWidth="8.75%p"
+        <Key android:codes="97" android:keyLabel="a"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_a"
-                android:keyEdgeFlags="left"/>
+                android:popupCharacters="áàâąã"
+                android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
         <Key android:codes="115" android:keyLabel="s"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_s"/>
+                android:popupCharacters="śšşß"/>
         <Key android:codes="100" android:keyLabel="d"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_d"/>
+                android:popupCharacters="ðď"/>
         <Key android:codes="102" android:keyLabel="f"/>
         <Key android:codes="103" android:keyLabel="g"/>
         <Key android:codes="104" android:keyLabel="h"/>
@@ -79,13 +81,14 @@
         <Key android:codes="107" android:keyLabel="k"/>
         <Key android:codes="108" android:keyLabel="l"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_l"/>
+                android:popupCharacters="ł"/>
         <Key android:keyLabel="ö"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_oe"/>
-        <Key android:keyLabel="ä" android:keyEdgeFlags="right" android:keyWidth="8.75%p"
+                android:popupCharacters="øœ"/>
+        <Key android:keyLabel="ä"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_ae"/>
+                android:popupCharacters="æ"
+                android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
     </Row>
 
     <Row android:keyWidth="10%p">
@@ -95,18 +98,18 @@
                 android:isSticky="true" android:keyEdgeFlags="left"/>
         <Key android:codes="122" android:keyLabel="z"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_z"/>
+                android:popupCharacters="źžż"/>
         <Key android:codes="120" android:keyLabel="x"/>
         <Key android:codes="99" android:keyLabel="c"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_c"/>
+                android:popupCharacters="çćč"/>
         <Key android:codes="118" android:keyLabel="v"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_v"/>
+                android:popupCharacters="w"/>
         <Key android:codes="98" android:keyLabel="b"/>
         <Key android:codes="110" android:keyLabel="n"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="@string/alternates_for_n"/>
+                android:popupCharacters="ńñň"/>
         <Key android:codes="109" android:keyLabel="m"/>
         <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
                 android:keyWidth="15%p" android:keyEdgeFlags="right"