From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 17 Jul 2012 17:12:56 +0000 (+0200)
Subject: Show list fragment in main activity
X-Git-Tag: 5.0.1~210^2~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0458ac7cbcc1cfbf298bdd4d8431425f6df7bcd2;p=thirdparty%2Fstrongswan.git

Show list fragment in main activity
---

diff --git a/src/frontends/android/res/layout/main.xml b/src/frontends/android/res/layout/main.xml
index bc12cd8231..104a26d036 100644
--- a/src/frontends/android/res/layout/main.xml
+++ b/src/frontends/android/res/layout/main.xml
@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2012 Tobias Brunner
+    Hochschule fuer Technik Rapperswil
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/hello" />
+    <fragment
+            class="org.strongswan.android.ui.VpnProfileListFragment"
+            android:id="@+id/profile_list_frag"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/src/frontends/android/res/values/strings.xml b/src/frontends/android/res/values/strings.xml
index 5b7acfc518..99859d1566 100644
--- a/src/frontends/android/res/values/strings.xml
+++ b/src/frontends/android/res/values/strings.xml
@@ -19,7 +19,6 @@
 
     <!-- Application -->
     <string name="app_name">strongSwan VPN Client</string>
-    <string name="hello">Hello World, strongSwanActivity!</string>
 
     <!-- VPN profile list -->
     <string name="no_profiles">No VPN profiles.</string>