From 5b97d4a3d62cb70c790f2c71c464224368483ae8 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 20 Jul 2012 00:16:01 +0200
Subject: - Use config file name instead for default VPN name (closes issue
 #53) - Allow importing the pkcs12 into the android keystone when converting
 configuration

---
 res/layout/config_converter.xml | 22 ++++++++++++++++++++++
 res/values/strings.xml          |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 res/layout/config_converter.xml

(limited to 'res')

diff --git a/res/layout/config_converter.xml b/res/layout/config_converter.xml
new file mode 100644
index 00000000..13733fb3
--- /dev/null
+++ b/res/layout/config_converter.xml
@@ -0,0 +1,22 @@
+<?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" >
+<CheckBox
+            android:id="@+id/importpkcs12"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/importpkcs12fromconfig"
+            android:visibility="gone"
+            />
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
+
+        
+        
+    </LinearLayout>
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 41015848..fca7a777 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -237,4 +237,5 @@
     <string name="faq_howto_title">Quick Start</string>
     <string name="setting_loadtun_summary">Try to load the tun.ko kernel module before trying to connect. Needs rooted devices.</string>
     <string name="setting_loadtun">Load tun module</string>
+    <string name="importpkcs12fromconfig">Import PKCS12 from configuration into Android Keystore</string>
 </resources>
-- 
cgit v1.2.3