From bbb46d2ab9680be7cd3919474ab27d5cebc92e1f Mon Sep 17 00:00:00 2001
From: Amith Yamasani <>
Date: Thu, 9 Apr 2009 22:17:04 -0700
Subject: [PATCH] AI 145664: Add Polish accents for "l". Move accents for "z"
 to donottranslate.xml from strings.xml   BUG=1776395

Automated import of CL 145664
---
 res/values-cs/donottranslate.xml |  2 ++
 res/values-pl/donottranslate.xml | 25 +++++++++++++++++++++++++
 res/values/donottranslate.xml    |  4 ++++
 res/values/strings.xml           |  2 --
 res/xml/kbd_qwerty.xml           |  5 ++++-
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 res/values-pl/donottranslate.xml

diff --git a/res/values-cs/donottranslate.xml b/res/values-cs/donottranslate.xml
index 41431388a..9c2a476a6 100644
--- a/res/values-cs/donottranslate.xml
+++ b/res/values-cs/donottranslate.xml
@@ -24,4 +24,6 @@
     <string name="alternates_for_r">ř</string>
     <!-- Accented characters related to "t" -->
     <string name="alternates_for_t">ť</string>
+    <!-- Accented characters related to "z" -->
+    <string name="alternates_for_z">ž</string>
 </resources>
diff --git a/res/values-pl/donottranslate.xml b/res/values-pl/donottranslate.xml
new file mode 100644
index 000000000..196e73c1d
--- /dev/null
+++ b/res/values-pl/donottranslate.xml
@@ -0,0 +1,25 @@
+<?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">
+    <!-- Accented characters related to "z" -->
+    <string name="alternates_for_z">źż</string>
+    <!-- Accented characters related to "l" -->
+    <string name="alternates_for_l">ł</string>    
+</resources>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index e766dba77..d9649f3b1 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -28,4 +28,8 @@
     <string name="alternates_for_r"></string>
     <!-- Accented characters related to "t" -->
     <string name="alternates_for_t"></string>
+    <!-- Accented characters related to "z" -->
+    <string name="alternates_for_z"></string>
+    <!-- Accented characters related to "l" -->
+    <string name="alternates_for_l"></string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25d990e81..e1ef1260f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -125,8 +125,6 @@
     <string name="alternates_for_c">ç</string>
     <!-- Accented forms of "y" -->
     <string name="alternates_for_y">ýÿ</string>
-    <!-- Accented forms of "z" -->
-    <string name="alternates_for_z"></string>
     
     <!-- Tip to long press on keys -->
     <string name="tip_long_press">Hold a key down to see accents (ø, ö, etc.)</string>
diff --git a/res/xml/kbd_qwerty.xml b/res/xml/kbd_qwerty.xml
index 979471059..fb8c574e4 100755
--- a/res/xml/kbd_qwerty.xml
+++ b/res/xml/kbd_qwerty.xml
@@ -74,7 +74,10 @@
         <Key android:codes="104" android:keyLabel="h"/>
         <Key android:codes="106" android:keyLabel="j"/>
         <Key android:codes="107" android:keyLabel="k"/>
-        <Key android:codes="108" android:keyLabel="l" android:keyEdgeFlags="right"/>
+        <Key android:codes="108" android:keyLabel="l" 
+                android:popupKeyboard="@xml/kbd_popup_template"
+                android:popupCharacters="@string/alternates_for_l"
+                android:keyEdgeFlags="right"/>
     </Row>
     
     <Row>