From e6f8bb04b6eed921ecd717c11a89646e9eed2b19 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 1 Dec 2010 21:26:16 +0900
Subject: [PATCH] Add fr_CH keyboard subtype

Change-Id: I3977f9e201e77a682c1c8bed221cca32204dafbe
---
 java/res/drawable/ic_subtype_keyboard_fr_ch.png | Bin 0 -> 2367 bytes
 java/res/drawable/ic_subtype_us_keyboard.png    | Bin 2390 -> 0 bytes
 java/res/values/strings.xml                     |   1 +
 java/res/xml/method.xml                         |   7 ++++++-
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 java/res/drawable/ic_subtype_keyboard_fr_ch.png
 delete mode 100644 java/res/drawable/ic_subtype_us_keyboard.png

diff --git a/java/res/drawable/ic_subtype_keyboard_fr_ch.png b/java/res/drawable/ic_subtype_keyboard_fr_ch.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef5fe4b3ca5b0c8a8ccd3883a808b9a96e198666
GIT binary patch
literal 2367
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

literal 0
HcmV?d00001

diff --git a/java/res/drawable/ic_subtype_us_keyboard.png b/java/res/drawable/ic_subtype_us_keyboard.png
deleted file mode 100644
index 8ed6cc8b2bcbabeb908032066e3a1c2e7615ec2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2390
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
IM6N<$f}X34ApigX

diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 63c9f4213..a0d776517 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -402,6 +402,7 @@
     <string name="subtype_mode_es_US_keyboard">Spanish (United States) Keyboard</string>
     <string name="subtype_mode_fr_keyboard">French Keyboard</string>
     <string name="subtype_mode_fr_CA_keyboard">French (Canada) Keyboard</string>
+    <string name="subtype_mode_fr_CH_keyboard">French (Switzerland) Keyboard</string>
     <string name="subtype_mode_it_keyboard">Italian Keyboard</string>
     <string name="subtype_mode_nb_keyboard">Norwegian Keyboard</string>
     <string name="subtype_mode_nl_keyboard">Dutch Keyboard</string>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 1ec301b32..4ee60da51 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,7 +20,7 @@
 <!-- The attributes in this XML file provide configuration information -->
 <!-- for the Input Method Manager. -->
 
-<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, it, nb, nl, sr, sv -->
+<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv -->
 <!-- Voice: cs, da, de, en_AU, en_GB, en_IN, en_NZ, en_US, es, fr, ko, ja, pl, pt, ru, tr, zh_CN, zh_TW -->
 <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
 <!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
@@ -74,6 +74,11 @@
             android:imeSubtypeLocale="fr_CA"
             android:imeSubtypeMode="keyboard"
     />
+    <subtype android:icon="@drawable/ic_subtype_keyboard_fr_ch"
+            android:label="@string/subtype_mode_fr_CH_keyboard"
+            android:imeSubtypeLocale="fr_CH"
+            android:imeSubtypeMode="keyboard"
+    />
     <subtype android:icon="@drawable/ic_subtype_keyboard_it"
             android:label="@string/subtype_mode_it_keyboard"
             android:imeSubtypeLocale="it"