aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-16 12:38:33 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-17 18:53:01 +0200
commitf677446d512a206a64e8fe9316baf42127a13435 (patch)
tree6c2877c601f02679f2e6ab1364c3009bb985863d /OpenKeychain/src/main/res/layout
parentb87a7372c9f5c5cca6cc90a5f4a95486b0766dda (diff)
downloadopen-keychain-f677446d512a206a64e8fe9316baf42127a13435.tar.gz
open-keychain-f677446d512a206a64e8fe9316baf42127a13435.tar.bz2
open-keychain-f677446d512a206a64e8fe9316baf42127a13435.zip
use KeyAdapter in KeySpinner
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/keyspinner_item.xml57
-rw-r--r--OpenKeychain/src/main/res/layout/keyspinner_item_none.xml19
2 files changed, 19 insertions, 57 deletions
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
deleted file mode 100644
index eea81eba5..000000000
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:orientation="horizontal"
- android:descendantFocusability="blocksDescendants"
- android:focusable="false"
- android:minHeight="44dip">
-
- <LinearLayout
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:focusable="true"
- android:orientation="vertical"
- android:paddingLeft="8dp"
- android:paddingRight="4dp">
-
- <TextView
- android:id="@+id/keyspinner_key_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/label_main_user_id"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
- android:id="@+id/keyspinner_key_email"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:text="user@example.com"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
- <TextView
- android:id="@+id/keyspinner_duplicate"
- android:text="creation: bla"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceSmall" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/keyspinner_key_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:src="@drawable/status_signature_revoked_cutout_24dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item_none.xml b/OpenKeychain/src/main/res/layout/keyspinner_item_none.xml
new file mode 100644
index 000000000..bd1d4ac11
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item_none.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:orientation="horizontal"
+ android:minHeight="44dip"
+ android:paddingLeft="8dp"
+ android:paddingRight="4dp">
+
+ <TextView
+ android:id="@+id/keyspinner_key_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/choice_none"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</LinearLayout> \ No newline at end of file