From cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92 Mon Sep 17 00:00:00 2001
From: Alex Fong <alexfongg@gmail.com>
Date: Mon, 21 Mar 2016 21:37:19 +0800
Subject: Redesigned subkey creation dialog and changed default key type
 created to RSA, 3072 bit.

Added code to prevent removal of master subkey when modifying a new key.
---
 .../res/layout/two_line_spinner_dropdown_item.xml  | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml

(limited to 'OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml')

diff --git a/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml b/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml
new file mode 100644
index 000000000..ae325eaab
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml
@@ -0,0 +1,32 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="10dp"
+    android:paddingTop="6dp"
+    android:paddingRight="10dp"
+    android:paddingBottom="6dp"
+    android:background="?android:attr/selectableItemBackground">
+
+    <TextView android:id="@android:id/text1"
+        style="?android:attr/spinnerDropDownItemStyle"
+        android:textStyle="bold"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dp"
+        android:paddingRight="6dp" />
+
+    <TextView android:id="@android:id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dp"
+        android:paddingRight="6dp"
+        android:paddingTop="2dp" />
+
+</LinearLayout>
+
+
+
+
-- 
cgit v1.2.3