From: Tobias Brunner <tobias@strongswan.org>
Date: Sat, 14 Jul 2012 15:12:07 +0000 (+0200)
Subject: Moved main Activity to ui sub-package
X-Git-Tag: 5.0.1~210^2~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=441dde9ee9ed4e1d8c4ab9e3998a3e52985c49d1;p=thirdparty%2Fstrongswan.git

Moved main Activity to ui sub-package

Also force portrait orientation.
---

diff --git a/src/frontends/android/AndroidManifest.xml b/src/frontends/android/AndroidManifest.xml
index c6f4e14e4b..836ef0f782 100644
--- a/src/frontends/android/AndroidManifest.xml
+++ b/src/frontends/android/AndroidManifest.xml
@@ -12,8 +12,10 @@
         android:icon="@drawable/strongswan"
         android:label="@string/app_name" >
         <activity
-            android:name=".strongSwanActivity"
-            android:label="@string/app_name" >
+            android:name=".ui.MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/src/frontends/android/src/org/strongswan/android/strongSwanActivity.java b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
similarity index 89%
rename from src/frontends/android/src/org/strongswan/android/strongSwanActivity.java
rename to src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
index fabf71897d..ae3a5e3efa 100644
--- a/src/frontends/android/src/org/strongswan/android/strongSwanActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
@@ -1,11 +1,11 @@
-package org.strongswan.android;
+package org.strongswan.android.ui;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.net.VpnService;
 import android.os.Bundle;
 
-public class strongSwanActivity extends Activity
+public class MainActivity extends Activity
 {
 	@Override
 	public void onCreate(Bundle savedInstanceState)