Merge "CM Gerrit tool to make submissions easier" into froyo
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml b/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
index 651a9d1..d2e0981 100644
--- a/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
+++ b/overlay/common/packages/inputmethods/OpenWnn/res/values/bools.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
<resources>
- <bool name="im_is_default">false</bool>
+ <add-resource type="bool" name="im_is_default">false</add-resource>
</resources>
diff --git a/overlay/common/packages/inputmethods/OpenWnn/res/xml/method_ja.xml b/overlay/common/packages/inputmethods/OpenWnn/res/xml/method_ja.xml
new file mode 100644
index 0000000..b633fec
--- /dev/null
+++ b/overlay/common/packages/inputmethods/OpenWnn/res/xml/method_ja.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2008,2009 OMRON SOFTWARE Co., Ltd.
+
+ 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.
+-->
+<!-- The attributes in this XML file provide configuration information -->
+<!-- for the Search Manager. -->
+
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+ android:settingsActivity="jp.co.omronsoft.openwnn.OpenWnnControlPanelJAJP"
+ android:isDefault="@bool/im_is_default"
+/>