From 82ee9d440b804030682f28669d08650b6ade6ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 31 Aug 2015 20:52:00 +0200
Subject: Use material overflow icon in decrypt list

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
---
 .../ic_menu_moreoverflow_normal_holo_light.png            | Bin 148 -> 0 bytes
 .../main/res/drawable-hdpi/ic_more_vert_black_24dp.png    | Bin 0 -> 132 bytes
 .../ic_menu_moreoverflow_normal_holo_light.png            | Bin 131 -> 0 bytes
 .../main/res/drawable-mdpi/ic_more_vert_black_24dp.png    | Bin 0 -> 108 bytes
 .../ic_menu_moreoverflow_normal_holo_light.png            | Bin 184 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_more_vert_black_24dp.png   | Bin 0 -> 155 bytes
 .../main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png  | Bin 0 -> 205 bytes
 .../main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png | Bin 0 -> 272 bytes
 OpenKeychain/src/main/res/layout/decrypt_list_entry.xml   |   7 ++++---
 9 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index bb6aef1d0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png
new file mode 100644
index 000000000..22acc5500
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_more_vert_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index 01d681697..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png
new file mode 100644
index 000000000..0e4f2f6ea
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_more_vert_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index 930ca8d95..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png
new file mode 100644
index 000000000..9f10aa275
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_more_vert_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png
new file mode 100644
index 000000000..94d5ab98c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_more_vert_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png
new file mode 100644
index 000000000..4642a3b66
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_more_vert_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index 577d825b7..7869b9a8a 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -90,11 +90,12 @@
 
                 <ImageView
                     android:id="@+id/context_menu"
-                    android:layout_width="wrap_content"
+                    android:scaleType="center"
+                    android:layout_width="36dip"
                     android:layout_height="48dip"
                     android:clickable="true"
-                    android:background="?android:selectableItemBackground"
-                    android:src="@drawable/ic_menu_moreoverflow_normal_holo_light" />
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:src="@drawable/ic_more_vert_black_24dp" />
 
             </LinearLayout>
 
-- 
cgit v1.2.3