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 c6f4e14e4b97a0d0ce71896e4409d01672204a6f..836ef0f78200dc15f16585f59078fe20db336103 100644 (file)
--- 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 fabf71897db7d22d0d4643d39c33a7e678ca1921..ae3a5e3efacef9840eed90c2fb337c8ea0887bb1 100644 (file)
--- 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)