summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/menu/agp_intents.xml3
-rw-r--r--app/src/main/res/menu/git_clone.xml3
-rw-r--r--app/src/main/res/menu/pgp_handler.xml3
-rw-r--r--app/src/main/res/menu/pwdstore.xml5
-rw-r--r--app/src/main/res/xml/preference.xml4
5 files changed, 13 insertions, 5 deletions
diff --git a/app/src/main/res/menu/agp_intents.xml b/app/src/main/res/menu/agp_intents.xml
index 591b9525..8aa52dfa 100644
--- a/app/src/main/res/menu/agp_intents.xml
+++ b/app/src/main/res/menu/agp_intents.xml
@@ -1,8 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context="com.zeapo.pwdstore.AgpIntentsActivity" >
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
- android:showAsAction="never" />
+ pwstore:showAsAction="never" />
</menu>
diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml
index fa9dbf1c..e414f0b9 100644
--- a/app/src/main/res/menu/git_clone.xml
+++ b/app/src/main/res/menu/git_clone.xml
@@ -1,8 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context="com.zeapo.pwdstore.GitHandler" >
<item android:id="@+id/user_pref"
android:title="@string/action_settings"
android:orderInCategory="100"
- android:showAsAction="never" />
+ pwstore:showAsAction="never" />
</menu>
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
index f9f88da8..fac4e163 100644
--- a/app/src/main/res/menu/pgp_handler.xml
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -1,9 +1,10 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
<item android:title="Copy password"
android:icon="@drawable/ico_copy"
- android:showAsAction="ifRoom"
+ pwstore:showAsAction="ifRoom"
android:id="@+id/copy_password"
/>
</menu>
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index 957a4795..d6f81b73 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -1,10 +1,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:pwstore="http://schemas.android.com/apk/res-auto"
tools:context=".pwdstore" >
<item android:id="@+id/menu_add_password"
android:icon="@drawable/ico_add"
- android:showAsAction="always"
+ pwstore:showAsAction="always"
android:title="New password"/>
<!--<item android:id="@+id/menu_add_category"-->
@@ -17,7 +18,7 @@
<item android:id="@+id/refresh"
android:title="Refresh list"
- android:showAsAction="never"
+ pwstore:showAsAction="never"
android:icon="@drawable/ico_sync"/>
<item android:id="@+id/user_pref"
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 56a16f49..0833ebf8 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -30,5 +30,9 @@
android:dialogTitle="Set the time you want the password to be in clipboard"
android:summary="Set the time you want the password to be in clipboard"
android:hint="45" android:key="general_show_time" />
+ <CheckBoxPreference android:title="Automatically Copy Password"
+ android:dialogTitle="Automatically copy the password to the clipboard after decryption was successful."
+ android:summary="Automatically copy the password to the clipboard after decryption was successful."
+ android:key="copy_on_decrypt" android:defaultValue="true" />
</PreferenceCategory>
</PreferenceScreen> \ No newline at end of file