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/layout/child_row_layout.xml | 4 ++--
 app/src/main/res/layout/encrypt_layout.xml   | 4 ++--
 app/src/main/res/layout/key_id.xml           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/app/src/main/res/layout/child_row_layout.xml b/app/src/main/res/layout/child_row_layout.xml
index 75efefad..d61586a9 100644
--- a/app/src/main/res/layout/child_row_layout.xml
+++ b/app/src/main/res/layout/child_row_layout.xml
@@ -10,7 +10,7 @@
             android:id="@+id/crypto_delete_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ico_del"
+            android:src="@drawable/ic_action_discard"
             android:background="@drawable/red_rectangle"
             android:layout_gravity="center_vertical"
             android:layout_column="1"
@@ -20,7 +20,7 @@
             android:id="@+id/crypto_show_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ico_key"
+            android:src="@drawable/ic_action_accounts"
             android:background="@drawable/blue_rectangle"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dp"
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 5f447a9d..5fc93b3c 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -97,7 +97,7 @@
         <ImageButton
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:src="@drawable/ico_confirm_add"
+            android:src="@drawable/ic_action_save"
             android:background="@drawable/blue_rectangle"
             android:id="@+id/crypto_confirm_add"
             android:onClick="handleClick"
@@ -108,7 +108,7 @@
         <ImageButton
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:src="@drawable/ico_cancel"
+            android:src="@drawable/ic_action_cancel"
             android:background="@drawable/red_rectangle"
             android:id="@+id/crypto_cancel_add"
             android:onClick="handleClick"
diff --git a/app/src/main/res/layout/key_id.xml b/app/src/main/res/layout/key_id.xml
index 00cbedde..ffeb7a0d 100644
--- a/app/src/main/res/layout/key_id.xml
+++ b/app/src/main/res/layout/key_id.xml
@@ -34,7 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_column="3"
-            android:src="@drawable/ico_key"
+            android:src="@drawable/ic_action_accounts"
             android:background="@android:color/transparent"
             android:onClick="handleClick"
             android:layout_gravity="center_vertical"/>
-- 
cgit v1.2.3