aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/menu
diff options
context:
space:
mode:
authorzeapo <mohamed@zenadi.com>2014-10-29 22:25:26 +0100
committerzeapo <mohamed@zenadi.com>2014-10-29 22:25:26 +0100
commitf8714f045f8da0003e1dc9b6a5df7af2057a0a8a (patch)
tree445a97806f69d392cc1428821839ac516870b520 /app/src/main/res/menu
parentca06b9626e33c195ff9c183be6c4e33a637bebf1 (diff)
parente33341da9797f030a2a33b83816f5e90a5a303fd (diff)
downloadHardenedPass-f8714f045f8da0003e1dc9b6a5df7af2057a0a8a.tar.gz
HardenedPass-f8714f045f8da0003e1dc9b6a5df7af2057a0a8a.zip
merge PR #24 changes made by jbaiter
Diffstat (limited to 'app/src/main/res/menu')
-rw-r--r--app/src/main/res/menu/context_pass.xml2
-rw-r--r--app/src/main/res/menu/pgp_handler.xml2
-rw-r--r--app/src/main/res/menu/pwdstore.xml4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/res/menu/context_pass.xml b/app/src/main/res/menu/context_pass.xml
index fce0d5fe..009e3fd4 100644
--- a/app/src/main/res/menu/context_pass.xml
+++ b/app/src/main/res/menu/context_pass.xml
@@ -4,7 +4,7 @@
tools:context=".pwdstore">
<item android:id="@+id/menu_delete_password"
- android:icon="@drawable/ico_del"
+ android:icon="@drawable/ic_action_discard"
app:showAsAction="always"
android:title="Delete"/>
</menu>
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
index fac4e163..56298a33 100644
--- a/app/src/main/res/menu/pgp_handler.xml
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -3,7 +3,7 @@
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:icon="@drawable/ic_action_copy"
pwstore:showAsAction="ifRoom"
android:id="@+id/copy_password"
/>
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index d5d4361d..bfb3ad0c 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -10,7 +10,7 @@
pwstore:actionViewClass="android.support.v7.widget.SearchView" />
<item android:id="@+id/menu_add_password"
- android:icon="@drawable/ico_add"
+ android:icon="@drawable/ic_action_new"
pwstore:showAsAction="ifRoom"
android:title="New password"/>
@@ -24,7 +24,7 @@
<item android:id="@+id/refresh"
android:title="Refresh list"
- pwstore:showAsAction="never"
+ android:showAsAction="never"
android:icon="@drawable/ico_sync"/>
<item android:id="@+id/user_pref"