switch to KP2A-Keyboard-2

src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj

@@ -51,9 +51,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <LibraryProjectZip Include="..\java\KP2ASoftKeyboard\project.zip">
+    <LibraryProjectZip Include="..\java\KP2ASoftKeyboard2\java\project.zip">
       <Link>project.zip</Link>
     </LibraryProjectZip>
+    <EmbeddedNativeLibrary Include="..\java\KP2ASoftKeyboard2\native\libs\armeabi-v7a\libjni_latinime.so">
+      <Link>libs\armeabi-v7a\libjni_latinime.so</Link>
+    </EmbeddedNativeLibrary>
+    <EmbeddedNativeLibrary Include="..\java\KP2ASoftKeyboard2\native\libs\armeabi\libjni_latinime.so">
+      <Link>libs\armeabi\libjni_latinime.so</Link>
+    </EmbeddedNativeLibrary>
     <None Include="Additions\AboutAdditions.txt" />
     <None Include="Jars\AboutJars.txt" />
   </ItemGroup>
@@ -62,5 +68,6 @@
     <TransformFile Include="Transforms\EnumMethods.xml" />
     <TransformFile Include="Transforms\Metadata.xml" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Novell\Xamarin.Android.Bindings.targets" />
 </Project>

src/Kp2aKeyboardBinding/Transforms/Metadata.xml

@@ -1,8 +1,9 @@
 <metadata>
 	<remove-node path="/api/package[@name='keepass2android.softkeyboard']/class[@name='KP2AKeyboard']" />
+	<remove-node path="/api/package[@name='keepass2android.softkeyboard']" />
 	<!--
   This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
+  
   
   This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
   <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />

src/java/KP2ASoftKeyboard/res/values/strings.xml

@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, 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">
     <!-- Title for Latin keyboard  -->
     <string name="ime_name">Keepass2Android</string>

src/java/KP2ASoftKeyboard/src/keepass2android/softkeyboard/KP2AKeyboard.java

@@ -33,6 +33,8 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.CompletionInfo;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;

src/keepass2android/keepass2android.csproj

@@ -28,9 +28,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE</DefineConstants>
+    <DefineConstants>DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;INCLUDE_KEYTRANSFORM;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
@@ -376,7 +376,9 @@
     <AndroidResource Include="Resources\drawable\ic99_blank.png" />
     <AndroidResource Include="Resources\drawable\ic_launcher_folder_small.png" />
     <AndroidResource Include="Resources\drawable\notify.png" />
-    <AndroidResource Include="Resources\layout\about.xml" />
+    <AndroidResource Include="Resources\layout\about.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\layout\database_settings.xml" />
     <AndroidResource Include="Resources\layout\entry_edit.xml" />
     <AndroidResource Include="Resources\layout\entry_list_entry.xml" />