From ec353b0c390f7b3f45b950171e56c6ddcd0a9607 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Thu, 26 Feb 2015 21:58:25 +0530
Subject: initial Log Display function

---
 OpenKeychain/src/main/res/menu/log_display.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/menu/log_display.xml

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

diff --git a/OpenKeychain/src/main/res/menu/log_display.xml b/OpenKeychain/src/main/res/menu/log_display.xml
new file mode 100644
index 000000000..03af3c5ad
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/log_display.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_log_display_export_log"
+        android:icon="@drawable/ic_action_save_white"
+        android:title="@string/menu_export_log"
+        app:showAsAction="ifRoom|withText" />
+
+</menu>
-- 
cgit v1.2.3


From 6c0a5c04e758a3ee972e121dee5d3a0fc598ff6b Mon Sep 17 00:00:00 2001
From: jiangkai <jiangkai@gmail.com>
Date: Tue, 3 Mar 2015 11:26:59 -0800
Subject: change icon name in layout files

---
 OpenKeychain/src/main/res/menu/key_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index c724c46a5..4a9fe16c7 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -22,7 +22,7 @@
 
     <item
         android:id="@+id/menu_key_view_delete"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="@drawable/ic_delete_grey_24dp"
         app:showAsAction="never"
         android:title="@string/menu_delete_key" />
 
-- 
cgit v1.2.3


From 7c8f338297aee49f98c40f74da504972b8198779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 20:57:11 +0100
Subject: Use material save icon

---
 OpenKeychain/src/main/res/menu/log_display.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/menu/log_display.xml b/OpenKeychain/src/main/res/menu/log_display.xml
index 03af3c5ad..7a2f77b79 100644
--- a/OpenKeychain/src/main/res/menu/log_display.xml
+++ b/OpenKeychain/src/main/res/menu/log_display.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_log_display_export_log"
-        android:icon="@drawable/ic_action_save_white"
+        android:icon="@drawable/ic_save_white_24dp"
         android:title="@string/menu_export_log"
         app:showAsAction="ifRoom|withText" />
 
-- 
cgit v1.2.3