add holo light icons

30 files changed, 5 insertions, 4 deletions

diff --git a/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png
index 224cc4ff4..236bff558 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_add_person.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_add_person.png
new file mode 100644
index 000000000..5ebac9706
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_discard.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_discard.png
new file mode 100644
index 000000000..9c717dd32
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_import_export.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_import_export.png
new file mode 100644
index 000000000..742ba271c
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_share.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_share.png
new file mode 100644
index 000000000..8a6cbfea2
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png
index ff7b1def9..c59f601ca 100644
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_settings.png
deleted file mode 100644
index 577e05587..000000000
--- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_settings.png
+++ /dev/null
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png
index 3797f99c0..ffe3a28d7 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_add_person.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_add_person.png
new file mode 100644
index 000000000..c43cf6553
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_discard.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_discard.png
new file mode 100644
index 000000000..9dfb7cc2c
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_import_export.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_import_export.png
new file mode 100644
index 000000000..1d6522beb
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_share.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_share.png
new file mode 100644
index 000000000..bff81179a
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png
index fb681ba26..1ed2c56ee 100644
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_settings.png
deleted file mode 100644
index f32a37e44..000000000
--- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_settings.png
+++ /dev/null
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png
index fa3d853e9..fabe9d965 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_add_person.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_add_person.png
new file mode 100644
index 000000000..91434a47b
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_discard.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_discard.png
new file mode 100644
index 000000000..db69d6c25
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_import_export.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_import_export.png
new file mode 100644
index 000000000..5e48a9c6b
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_share.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_share.png
new file mode 100644
index 000000000..2f6dc413b
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png
index b9bc3d70f..a5fa74def 100644
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_settings.png
deleted file mode 100644
index aa33c3880..000000000
--- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_settings.png
+++ /dev/null
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/drawer_shadow.9.png b/OpenPGP-Keychain/res/drawable-xxhdpi/drawer_shadow.9.png
new file mode 100644
index 000000000..b91e9d7f2
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xxhdpi/drawer_shadow.9.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_add_person.png b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_add_person.png
new file mode 100644
index 000000000..f18aa6144
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_discard.png b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_discard.png
new file mode 100644
index 000000000..b522daffe
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_import_export.png b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_import_export.png
new file mode 100644
index 000000000..f054a68e6
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_import_export.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_share.png b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_share.png
new file mode 100644
index 000000000..3e441000f
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_action_share.png
diff --git a/OpenPGP-Keychain/res/drawable-xxhdpi/ic_drawer.png b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_drawer.png
new file mode 100644
index 000000000..9c4685d6e
--- /dev/null
+++ b/OpenPGP-Keychain/res/drawable-xxhdpi/ic_drawer.png
diff --git a/OpenPGP-Keychain/res/menu/key_list_public.xml b/OpenPGP-Keychain/res/menu/key_list_public.xml
index 7b6261558..72ebe0216 100644
--- a/OpenPGP-Keychain/res/menu/key_list_public.xml
+++ b/OpenPGP-Keychain/res/menu/key_list_public.xml
@@ -4,6 +4,7 @@
     <item
         android:id="@+id/menu_key_list_public_import"
         android:showAsAction="always|withText"
+        android:icon="@drawable/ic_action_add_person"
         android:title="@string/menu_import"/>
     <item
         android:id="@+id/menu_key_list_public_export"
diff --git a/OpenPGP-Keychain/res/menu/key_list_public_multi.xml b/OpenPGP-Keychain/res/menu/key_list_public_multi.xml
index 92481e9cb..e750c1259 100644
--- a/OpenPGP-Keychain/res/menu/key_list_public_multi.xml
+++ b/OpenPGP-Keychain/res/menu/key_list_public_multi.xml
@@ -6,7 +6,7 @@
         android:title="@string/menu_encrypt_to"/>
     <item
         android:id="@+id/menu_key_list_public_multi_delete"
-        android:icon="@android:drawable/ic_menu_delete"
+        android:icon="@drawable/ic_action_discard"
         android:title="@string/menu_delete_key"/>
 
 </menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/menu/key_view.xml b/OpenPGP-Keychain/res/menu/key_view.xml
index 1078cd937..d81c56a33 100644
--- a/OpenPGP-Keychain/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/res/menu/key_view.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/menu_key_view_share"
-        android:icon="@android:drawable/ic_menu_share"
+        android:icon="@drawable/ic_action_share"
         android:showAsAction="always"
         android:title="@string/menu_share">
         <menu>
@@ -27,7 +27,7 @@
     </item>
     <item
         android:id="@+id/menu_key_keyserver"
-        android:icon="@android:drawable/ic_menu_upload"
+        android:icon="@drawable/ic_action_import_export"
         android:showAsAction="always"
         android:title="@string/menu_share">
         <menu>
@@ -43,7 +43,7 @@
     </item>
     <item
         android:id="@+id/menu_key_view_sign"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
         android:title="@string/menu_sign_key"/>
     <item
         android:id="@+id/menu_key_view_export_file"