From e33341da9797f030a2a33b83816f5e90a5a303fd Mon Sep 17 00:00:00 2001
From: zeapo <mohamed@zenadi.com>
Date: Wed, 29 Oct 2014 22:25:11 +0100
Subject: Merge pull request #24 from jbaiter/holo-icons

Previously most of the icons looked a bit cobbled together and not very Android-y. This PR replaces them with semantically equivalent icons from Google's Iconography recommendations.
This aligns Android-Password-Store more with Google's design recommendations and other Android apps.
---
 app/src/main/res/menu/context_pass.xml | 2 +-
 app/src/main/res/menu/pgp_handler.xml  | 2 +-
 app/src/main/res/menu/pwdstore.xml     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/res/menu')

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"
-- 
cgit v1.2.3