From e30e45fa27159fa75325f96f527288376b369145 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Wed, 18 Aug 2010 08:17:09 -0400
Subject: [PATCH] cm: Set the default IME based on locale.

I'm not sure why AOSP isn't doing this already. PinyinIME and OpenWnn
are both missing directives to tell it when it should be the default, so
it thinks it's always the default, overriding LatinIME for English
locales.
---
 .../SettingsProvider/res/values/defaults.xml   |  1 -
 .../OpenWnn/res/values-ja-rCN/bools.xml        | 18 ++++++++++++++++++
 .../OpenWnn/res/values-ja/bools.xml            | 18 ++++++++++++++++++
 .../inputmethods/OpenWnn/res/values/bools.xml  | 18 ++++++++++++++++++
 .../PinyinIME/res/values/bools.xml             | 18 ++++++++++++++++++
 5 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 overlay/common/packages/inputmethods/OpenWnn/res/values-ja-rCN/bools.xml
 create mode 100644 overlay/common/packages/inputmethods/OpenWnn/res/values-ja/bools.xml
 create mode 100644 overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
 create mode 100644 overlay/common/packages/inputmethods/PinyinIME/res/values/bools.xml

diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 54713965..21f31670 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,5 +18,4 @@
 -->
 <resources>
     <string name="def_backup_transport">com.google.android.backup/.BackupTransportService</string>
-    <string name="default_input_method">com.android.inputmethod.latin/.LatinIME</string>
 </resources>
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/values-ja-rCN/bools.xml b/overlay/common/packages/inputmethods/OpenWnn/res/values-ja-rCN/bools.xml
new file mode 100644
index 00000000..651a9d17
--- /dev/null
+++ b/overlay/common/packages/inputmethods/OpenWnn/res/values-ja-rCN/bools.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 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>
+  <bool name="im_is_default">false</bool>
+</resources>
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/values-ja/bools.xml b/overlay/common/packages/inputmethods/OpenWnn/res/values-ja/bools.xml
new file mode 100644
index 00000000..651a9d17
--- /dev/null
+++ b/overlay/common/packages/inputmethods/OpenWnn/res/values-ja/bools.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 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>
+  <bool name="im_is_default">false</bool>
+</resources>
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml b/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
new file mode 100644
index 00000000..651a9d17
--- /dev/null
+++ b/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 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>
+  <bool name="im_is_default">false</bool>
+</resources>
diff --git a/overlay/common/packages/inputmethods/PinyinIME/res/values/bools.xml b/overlay/common/packages/inputmethods/PinyinIME/res/values/bools.xml
new file mode 100644
index 00000000..651a9d17
--- /dev/null
+++ b/overlay/common/packages/inputmethods/PinyinIME/res/values/bools.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 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>
+  <bool name="im_is_default">false</bool>
+</resources>