moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2025-02-07 02:10:10 -05:00
Code Issues Releases Wiki Activity

More changes due to other Mono Version and VS2012

Browse Source
This commit is contained in:
Philipp Crocoll 2013-08-03 12:33:47 +02:00
parent 4f7744999f
commit ac88da90e7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kp2aUnitTests/Kp2aUnitTests.csproj
View File

@ -15,6 +15,7 @@
<AndroidApplication>true</AndroidApplication> <AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -95,6 +96,9 @@
<Name>MonoDroidUnitTesting</Name> <Name>MonoDroidUnitTesting</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<TransformFile Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
src/keepass2android/keepass2android.csproj
View File

@ -643,6 +643,7 @@
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<ItemGroup> <ItemGroup>
<Folder Include="Assets\" /> <Folder Include="Assets\" />
<Folder Include="SupportLib\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj"> <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
@ -671,9 +672,6 @@
</Properties> </Properties>
</MonoDevelop> </MonoDevelop>
</ProjectExtensions> </ProjectExtensions>
<ItemGroup>
<AndroidJavaLibrary Include="SupportLib\android-support-v4.jar" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<AndroidNativeLibrary Include="..\java\kp2akeytransform\libs\armeabi\libfinal-key.so"> <AndroidNativeLibrary Include="..\java\kp2akeytransform\libs\armeabi\libfinal-key.so">
<Link>libs\armeabi\libfinal-key.so</Link> <Link>libs\armeabi\libfinal-key.so</Link>

2
src/keepass2android/services/CopyToClipboardService.cs
View File

@ -469,7 +469,7 @@ namespace keepass2android
if (currentIme == kp2aIme) if (currentIme == kp2aIme)
{ {
imeManager.ToggleSoftInput(ShowSoftInputFlags.Forced, HideSoftInputFlags.None); imeManager.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.None);
} }
else else
{ {