From dde19eed051d8e929ce482b3672a37d7f83ed521 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Thu, 17 Sep 2015 04:57:11 +0200
Subject: [PATCH] fix crash when rotating device in Password/QuickUnlock
 because of duplicate id make white icons visible in icon picker

---
 src/keepass2android/IconPickerActivity.cs            | 5 ++++-
 src/keepass2android/Resources/layout/QuickUnlock.xml | 1 -
 src/keepass2android/Resources/layout/password.xml    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/keepass2android/IconPickerActivity.cs b/src/keepass2android/IconPickerActivity.cs
index be838bd1..15028023 100644
--- a/src/keepass2android/IconPickerActivity.cs
+++ b/src/keepass2android/IconPickerActivity.cs
@@ -18,6 +18,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
 using System;
 using Android.App;
 using Android.Content;
+using Android.Graphics;
 using Android.OS;
 using Android.Views;
 using Android.Widget;
@@ -101,7 +102,9 @@ namespace keepass2android
 				tv.Text = "" + position;
 				ImageView iv = (ImageView) currView.FindViewById(Resource.Id.icon_image);
 				iv.SetImageResource(Icons.IconToResId((KeePassLib.PwIcon)position, false));
-				
+				Android.Graphics.PorterDuff.Mode mMode = Android.Graphics.PorterDuff.Mode.SrcAtop;
+				Color color = new Color(189, 189, 189);
+				iv.SetColorFilter(color, mMode);
 				return currView;
 			}
 		}
diff --git a/src/keepass2android/Resources/layout/QuickUnlock.xml b/src/keepass2android/Resources/layout/QuickUnlock.xml
index a94480e4..09f2defb 100644
--- a/src/keepass2android/Resources/layout/QuickUnlock.xml
+++ b/src/keepass2android/Resources/layout/QuickUnlock.xml
@@ -106,7 +106,6 @@ android:fitsSystemWindows="true">
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
       <LinearLayout
-          android:id="@+id/main_content"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           android:orientation="vertical"
diff --git a/src/keepass2android/Resources/layout/password.xml b/src/keepass2android/Resources/layout/password.xml
index 8aefaa8f..18f1d2bb 100644
--- a/src/keepass2android/Resources/layout/password.xml
+++ b/src/keepass2android/Resources/layout/password.xml
@@ -94,6 +94,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
                         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+                        app:titleTextStyle="@style/MyTitleTextStyle"
                         app:layout_collapseMode="pin" />
                 </android.support.design.widget.CollapsingToolbarLayout>
             </android.support.design.widget.AppBarLayout>
@@ -103,7 +104,6 @@
                 android:layout_height="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior">
                 <LinearLayout
-                    android:id="@+id/main_content"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="vertical"