aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-16 17:47:16 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-16 17:47:16 +0200
commit97c55ee4bb519236027edc973851e7bbc52c97f3 (patch)
tree1390349b9e784881fe7b5ae38d61e7c5954b4d61 /OpenKeychain/src/main/res/layout
parentce105d955fff57d8e7b90acbf823d66567e89290 (diff)
downloadopen-keychain-97c55ee4bb519236027edc973851e7bbc52c97f3.tar.gz
open-keychain-97c55ee4bb519236027edc973851e7bbc52c97f3.tar.bz2
open-keychain-97c55ee4bb519236027edc973851e7bbc52c97f3.zip
multidecrypt: context menu per card, not per file
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_list_entry.xml12
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml10
2 files changed, 12 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index e6ee67580..47a8d85c4 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -78,14 +78,24 @@
<TextView
android:id="@+id/result_encryption_text"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text=""
tools:text="Encryption status text" />
+
+ <ImageView
+ android:id="@+id/context_menu"
+ android:layout_width="wrap_content"
+ android:layout_height="48dip"
+ android:clickable="true"
+ android:background="?android:selectableItemBackground"
+ android:src="@drawable/ic_menu_moreoverflow_normal_holo_light" />
+
</LinearLayout>
<LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
index b37ac1013..f13a43fd6 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
@@ -6,6 +6,7 @@
android:id="@+id/file"
android:clickable="true"
android:background="?android:selectableItemBackground"
+ android:minHeight="?listPreferredItemHeight"
>
<ImageView
@@ -51,13 +52,4 @@
</LinearLayout>
- <ImageView
- android:id="@+id/context_menu"
- 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" />
-
</LinearLayout> \ No newline at end of file