From 0c60828a21944505893e154a8f26ed8d34289adb Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Wed, 23 Dec 2015 22:15:32 +0100
Subject: [PATCH 1/4] increased version code

---
 src/keepass2android/Properties/AndroidManifest_net.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index 6db78734..5ebe8933 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="64" 
-			android:versionName="0.9.9c" 
+			android:versionCode="66" 
+			android:versionName="0.9.9e" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />

From 35cb4edb048cc1295df799bbf74348790cabd17b Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Tue, 29 Dec 2015 15:25:52 +0100
Subject: [PATCH 2/4] fix problem with Android 4.x storage type selection

---
 src/ZlibAndroid/ZlibAndroid.csproj                             | 2 +-
 src/keepass2android/Resources/drawable/storagetype_grid_bg.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ZlibAndroid/ZlibAndroid.csproj b/src/ZlibAndroid/ZlibAndroid.csproj
index 682a54e3..3858ce1c 100644
--- a/src/ZlibAndroid/ZlibAndroid.csproj
+++ b/src/ZlibAndroid/ZlibAndroid.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/src/keepass2android/Resources/drawable/storagetype_grid_bg.xml b/src/keepass2android/Resources/drawable/storagetype_grid_bg.xml
index 8896a489..f43a6774 100644
--- a/src/keepass2android/Resources/drawable/storagetype_grid_bg.xml
+++ b/src/keepass2android/Resources/drawable/storagetype_grid_bg.xml
@@ -3,7 +3,7 @@
 	<item >
 		<shape android:shape="rectangle"  >
 			<corners android:radius="6dip" />
-			<solid android:color="?activityBackgroundColor" />
+			<solid android:color="#fff" />
 		</shape>
 	</item>
 </selector>
\ No newline at end of file

From 51e269527cded519073722fffd1ee5ae25667b60 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Tue, 29 Dec 2015 15:34:13 +0100
Subject: [PATCH 3/4] fix wrong display name of built-in icon set

---
 src/keepass2android/settings/DatabaseSettingsActivity.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/keepass2android/settings/DatabaseSettingsActivity.cs b/src/keepass2android/settings/DatabaseSettingsActivity.cs
index 4171ff53..2704008a 100644
--- a/src/keepass2android/settings/DatabaseSettingsActivity.cs
+++ b/src/keepass2android/settings/DatabaseSettingsActivity.cs
@@ -166,7 +166,7 @@ namespace keepass2android
 
 				_iconSets.Add(new IconSet()
 				{
-					DisplayName = AppNames.AppName,
+					DisplayName = Context.GetString(AppNames.AppNameResource),
 					PackageName = Context.PackageName
 				});
 

From 850b64f1782d0bcffe861b22f8650d2c4ead9b78 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Tue, 29 Dec 2015 20:39:33 +0100
Subject: [PATCH 4/4] set version code for 0.9.9e release

---
 src/keepass2android/Properties/AndroidManifest_net.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index 5ebe8933..cf6d0cb9 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="66" 
+			android:versionCode="68" 
 			android:versionName="0.9.9e" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">