From d000b6f88492e287e59e3bba2f496b2b3149dca4 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 21 Feb 2019 14:17:26 +0100
Subject: [PATCH] Add lock button always visible

---
 .../com/kunzisoft/keepass/activities/EntryEditActivity.java  | 5 +++++
 app/src/main/res/menu/database_lock.xml                      | 2 +-
 app/src/main/res/menu/entry.xml                              | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
index 06b52d4c2..c9641526e 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
@@ -467,6 +467,7 @@ public class EntryEditActivity extends LockingHideActivity
 		super.onCreateOptionsMenu(menu);
 		
 		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.database_lock, menu);
 		MenuUtil.INSTANCE.contributionMenuInflater(inflater, menu);
 		
 		return true;
@@ -474,6 +475,10 @@ public class EntryEditActivity extends LockingHideActivity
 	
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch ( item.getItemId() ) {
+			case R.id.menu_lock:
+				lockAndExit();
+				return true;
+
 			case R.id.menu_contribute:
 				return MenuUtil.INSTANCE.onContributionItemSelected(this);
 
diff --git a/app/src/main/res/menu/database_lock.xml b/app/src/main/res/menu/database_lock.xml
index eb3a59068..387436df3 100644
--- a/app/src/main/res/menu/database_lock.xml
+++ b/app/src/main/res/menu/database_lock.xml
@@ -23,5 +23,5 @@
         android:icon="@drawable/ic_lock_white_24dp"
         android:title="@string/menu_lock"
         android:orderInCategory="81"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/entry.xml b/app/src/main/res/menu/entry.xml
index b768c098b..1c351e93d 100644
--- a/app/src/main/res/menu/entry.xml
+++ b/app/src/main/res/menu/entry.xml
@@ -28,7 +28,7 @@
         android:icon="@drawable/ic_mode_edit_white_24dp"
         android:title="@string/menu_edit"
         android:orderInCategory="22"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
     <item android:id="@+id/menu_goto_url"
         android:icon="@drawable/ic_launch_white_24dp"
         android:title="@string/menu_url"