From 5de1e2be8350c72bee347dc88197291101af7566 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Sat, 3 Oct 2015 20:35:05 +0200
Subject: [PATCH] fix scaling bug with icons

---
 src/keepass2android/GroupEditActivity.cs            | 3 +--
 src/keepass2android/Resources/layout/group_edit.xml | 2 +-
 src/keepass2android/Resources/layout/icon.xml       | 2 +-
 src/keepass2android/Resources/values/strings.xml    | 3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/keepass2android/GroupEditActivity.cs b/src/keepass2android/GroupEditActivity.cs
index ea4d8f5a..90b6aaaa 100644
--- a/src/keepass2android/GroupEditActivity.cs
+++ b/src/keepass2android/GroupEditActivity.cs
@@ -81,8 +81,7 @@ namespace keepass2android
 			SetContentView (Resource.Layout.group_edit);
 
 			ImageButton iconButton = (ImageButton)FindViewById (Resource.Id.icon_button);
-            iconButton.SetScaleType(ImageView.ScaleType.FitXy);
-			iconButton.Click += (sender, e) => 
+            iconButton.Click += (sender, e) => 
 			{
 				IconPickerActivity.Launch (this);
 			};
diff --git a/src/keepass2android/Resources/layout/group_edit.xml b/src/keepass2android/Resources/layout/group_edit.xml
index 382c85c6..c4084be0 100644
--- a/src/keepass2android/Resources/layout/group_edit.xml
+++ b/src/keepass2android/Resources/layout/group_edit.xml
@@ -6,7 +6,7 @@
         android:id="@+id/icon_button"
         android:layout_width="64dp"
         android:layout_height="64dp"
-        android:scaleType="fitXY"
+        android:scaleType="fitCenter"
         android:src="@drawable/ic00"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true" />
diff --git a/src/keepass2android/Resources/layout/icon.xml b/src/keepass2android/Resources/layout/icon.xml
index 5a952dfd..a050f7c0 100644
--- a/src/keepass2android/Resources/layout/icon.xml
+++ b/src/keepass2android/Resources/layout/icon.xml
@@ -32,7 +32,7 @@
     android:id="@+id/icon_image"
     android:layout_width="40dp"
     android:layout_height="40dp"
-    android:scaleType="fitXY"
+    android:scaleType="fitCenter"
     android:src="@drawable/ic99_blank">
   </ImageView>
   <TextView
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 927f93a7..6d384323 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -552,10 +552,11 @@
   <string name="ChangeLog_0_9_9">
 		Version 0.9.9\n
 		* Complete UI redesign. Thanks a lot to Stefano Pignataro (http://www.spstudio.at) for his support!\n
+    * Allow to add custom icons\n
     * Support for Multi Window mode on Samsung devices\n
     * Increased default number of encryption rounds for new databases\n
     * Check for duplicate keys of additional fields to avoid losing data\n
-    * Allow to add custom icons
+    
 	</string>