From ef2449917e53e312ebc2eb4bea7e3149ba9db137 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Thu, 14 Aug 2014 12:22:02 +0200
Subject: factor KeySpinner out

---
 .../res/layout/encrypt_asymmetric_fragment.xml     |  2 +-
 .../main/res/layout/encrypt_asymmetric_signkey.xml | 31 ----------------------
 .../src/main/res/layout/keyspinner_key.xml         | 31 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
 create mode 100644 OpenKeychain/src/main/res/layout/keyspinner_key.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 4d82477bc..2189a1f34 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -24,7 +24,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/label_asymmetric_from" />
 
-        <Spinner
+        <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
             android:id="@+id/sign"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
deleted file mode 100644
index 703f9133b..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="wrap_content"
-              android:padding="4dp"
-              android:layout_height="wrap_content">
-    <TextView android:id="@android:id/title"
-              android:textColor="?android:attr/textColorSecondary"
-              android:textSize="18sp"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:singleLine="true"
-              android:ellipsize="end"/>
-    <TextView android:id="@android:id/text1"
-              android:textColor="?android:attr/textColorTertiary"
-              android:textSize="14sp"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:singleLine="true"
-              android:ellipsize="end"
-              android:layout_marginTop="-4dip"/>
-    <TextView android:id="@android:id/text2"
-              android:textColor="?android:attr/textColorTertiary"
-              android:textSize="14sp"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:singleLine="true"
-              android:ellipsize="end"
-              android:layout_marginTop="-4dip"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_key.xml b/OpenKeychain/src/main/res/layout/keyspinner_key.xml
new file mode 100644
index 000000000..703f9133b
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/keyspinner_key.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:padding="4dp"
+              android:layout_height="wrap_content">
+    <TextView android:id="@android:id/title"
+              android:textColor="?android:attr/textColorSecondary"
+              android:textSize="18sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"/>
+    <TextView android:id="@android:id/text1"
+              android:textColor="?android:attr/textColorTertiary"
+              android:textSize="14sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_marginTop="-4dip"/>
+    <TextView android:id="@android:id/text2"
+              android:textColor="?android:attr/textColorTertiary"
+              android:textSize="14sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_marginTop="-4dip"/>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3