From 6055b0b0da6ca3f6fdae3b7b1602a38d3a05bb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 5 May 2014 00:58:22 +0200
Subject: New key view design, using Android flat buttons and Android icons

---
 OpenKeychain/src/main/res/menu/key_view.xml | 51 ++---------------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

(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 2f5697a0f..864016801 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -2,53 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/menu_key_view_share"
-        android:icon="@drawable/ic_action_share"
-        app:showAsAction="always"
-        android:title="@string/menu_share">
-        <menu>
-            <item
-                android:id="@+id/menu_key_view_share_fingerprint_title"
-                app:showAsAction="never"
-                android:title="@string/menu_share_title_fingerprint">
-                <menu>
-                    <item
-                        android:id="@+id/menu_key_view_share_default_fingerprint"
-                        app:showAsAction="never"
-                        android:title="@string/menu_share_default_fingerprint" />
-                    <item
-                        android:id="@+id/menu_key_view_share_qr_code_fingerprint"
-                        app:showAsAction="never"
-                        android:title="@string/menu_share_qr_code_fingerprint" />
-                </menu>
-            </item>
-            <item
-                android:id="@+id/menu_key_view_share_title"
-                app:showAsAction="never"
-                android:title="@string/menu_share_title">
-                <menu>
-                    <item
-                        android:id="@+id/menu_key_view_share_default"
-                        app:showAsAction="never"
-                        android:title="@string/menu_share_default" />
-                    <item
-                        android:id="@+id/menu_key_view_share_qr_code"
-                        app:showAsAction="never"
-                        android:title="@string/menu_share_qr_code" />
-                    <item
-                        android:id="@+id/menu_key_view_share_nfc"
-                        app:showAsAction="never"
-                        android:title="@string/menu_share_nfc" />
-                    <item
-                        android:id="@+id/menu_key_view_share_clipboard"
-                        app:showAsAction="never"
-                        android:title="@string/menu_copy_to_clipboard" />
-                </menu>
-            </item>
-        </menu>
-    </item>
-
     <item
         android:id="@+id/menu_key_keyserver"
         android:icon="@drawable/ic_action_cloud"
@@ -69,13 +22,13 @@
     <item
         android:id="@+id/menu_key_view_export_file"
         android:icon="@drawable/ic_action_import_export"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
         android:title="@string/menu_export_key" />
 
     <item
         android:id="@+id/menu_key_view_delete"
         android:icon="@drawable/ic_action_discard"
-        app:showAsAction="ifRoom"
+        app:showAsAction="never"
         android:title="@string/menu_delete_key" />
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3