aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-07-14 17:12:07 +0200
committerTobias Brunner <tobias@strongswan.org>2012-08-08 15:41:04 +0200
commit441dde9ee9ed4e1d8c4ab9e3998a3e52985c49d1 (patch)
tree44de75c1260feb2e250e73282721c6607fd7586e /src
parent8bf30276431afb6d02dc1d648fe0d2ab4a8d94ce (diff)
downloadstrongswan-441dde9ee9ed4e1d8c4ab9e3998a3e52985c49d1.tar.bz2
strongswan-441dde9ee9ed4e1d8c4ab9e3998a3e52985c49d1.tar.xz
Moved main Activity to ui sub-package
Also force portrait orientation.
Diffstat (limited to 'src')
-rw-r--r--src/frontends/android/AndroidManifest.xml6
-rw-r--r--src/frontends/android/src/org/strongswan/android/ui/MainActivity.java (renamed from src/frontends/android/src/org/strongswan/android/strongSwanActivity.java)4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/frontends/android/AndroidManifest.xml b/src/frontends/android/AndroidManifest.xml
index c6f4e14e4..836ef0f78 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
index fabf71897..ae3a5e3ef 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)