From dca67df888680da70235ce402e42e05945f67cb8 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 23 Apr 2012 00:07:02 +0200
Subject: Doing progress on the Preference dialog chaos

--HG--
rename : res/layout/config.xml => res/layout/basic_settings.xml
rename : src/de/blinkt/openvpn/AboutActivity.java => src/de/blinkt/openvpn/AboutFragment.java
---
 res/xml/vpn_headers.xml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'res/xml/vpn_headers.xml')

diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index 7d0ade3f..424b4411 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <header android:summary="Server, port and authentication method. Normally you should only settings specified here." >
-	    android:title="Basic Setting"
-        <intent
-            android:targetClass="de.blinkt.openvpn.OpenVPNClient"
-            android:targetPackage="de.binkt.openvpn" />
-    </header>
+    <header
+        android:fragment="de.blinkt.openvpn.BasicSettings"
+        android:summary="Server, port and authentication method. Normally you should only settings specified here."
+        android:title="Basic Settings" />
     <!-- android:icon="@drawable/ic_settings_applications" -->
+
     <header
         android:fragment="de.blinkt.openvpn.VPNPreferences$IP_Settings"
         android:summary="IP Address and Routing"
         android:title="IP Settings" />
-    
-        <header
+    <header
         android:fragment="de.blinkt.openvpn.VPNPreferences$Authentication"
         android:summary="Authentication"
         android:title="Authentication" />
-    
 
     <!-- android:icon="@drawable/ic_settings_display" -->
     <header
@@ -33,14 +30,9 @@
             android:name="someKey"
             android:value="someHeaderValue" />
     </header>
-
-    <!-- android:icon="@drawable/ic_settings_display" -->
     <header
-        android:summary="Launches an Intent."
-        android:title="Intent" >
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="http://www.android.com" />
-    </header>
+        android:fragment="de.blinkt.openvpn.ShowConfigFragment"
+        android:summary="Shows the generated openvpn Configuration File"
+        android:title="Generated Config" />
 
 </preference-headers>
\ No newline at end of file
-- 
cgit v1.2.3