rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add lock button always visible

Browse Source
This commit is contained in:
J-Jamet
2019-02-21 14:17:26 +01:00
parent e0b0dd134f
commit d000b6f884
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
View File

@@ -467,6 +467,7 @@ public class EntryEditActivity extends LockingHideActivity
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.database_lock, menu);
MenuUtil.INSTANCE.contributionMenuInflater(inflater, menu); MenuUtil.INSTANCE.contributionMenuInflater(inflater, menu);
return true; return true;
@@ -474,6 +475,10 @@ public class EntryEditActivity extends LockingHideActivity
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch ( item.getItemId() ) { switch ( item.getItemId() ) {
case R.id.menu_lock:
lockAndExit();
return true;
case R.id.menu_contribute: case R.id.menu_contribute:
return MenuUtil.INSTANCE.onContributionItemSelected(this); return MenuUtil.INSTANCE.onContributionItemSelected(this);

2
app/src/main/res/menu/database_lock.xml
View File

@@ -23,5 +23,5 @@
android:icon="@drawable/ic_lock_white_24dp" android:icon="@drawable/ic_lock_white_24dp"
android:title="@string/menu_lock" android:title="@string/menu_lock"
android:orderInCategory="81" android:orderInCategory="81"
app:showAsAction="ifRoom" /> app:showAsAction="always" />
</menu> </menu>

2
app/src/main/res/menu/entry.xml
View File

@@ -28,7 +28,7 @@
android:icon="@drawable/ic_mode_edit_white_24dp" android:icon="@drawable/ic_mode_edit_white_24dp"
android:title="@string/menu_edit" android:title="@string/menu_edit"
android:orderInCategory="22" android:orderInCategory="22"
app:showAsAction="always" /> app:showAsAction="ifRoom" />
<item android:id="@+id/menu_goto_url" <item android:id="@+id/menu_goto_url"
android:icon="@drawable/ic_launch_white_24dp" android:icon="@drawable/ic_launch_white_24dp"
android:title="@string/menu_url" android:title="@string/menu_url"