diff options
| author | Mohamed Zenadi <mohamed.zenadi@gmail.com> | 2014-10-29 12:38:11 +0100 |
|---|---|---|
| committer | Mohamed Zenadi <mohamed.zenadi@gmail.com> | 2014-10-29 12:38:11 +0100 |
| commit | 021bec9f92ede8777930d400e27eacc37e5c1266 (patch) | |
| tree | 0aeaa16e8e8dc02ead3e6411d5a589c072ccc75c /app/src/main/res/menu | |
| parent | ad81e9b0dff8fe6b40502604dc615f1eb7e2c54d (diff) | |
| parent | 741ce31abb9bcb82262461f9b8ec8101b962e6f0 (diff) | |
Merge pull request #23 from jbaiter/copy-on-show
Add option to automatically copy password to clipboard after decryption
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/agp_intents.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/git_clone.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/pgp_handler.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/pwdstore.xml | 5 |
4 files changed, 9 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" |