summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-04-23 00:07:02 +0200
committerArne Schwabe <arne@rfc2549.org>2012-04-23 00:07:02 +0200
commitdca67df888680da70235ce402e42e05945f67cb8 (patch)
treeed66e30a6d1acf1fcb68672cb636507e0bd89d2a /AndroidManifest.xml
parent488a41cc60636298581c2b44b4706b259fc98a36 (diff)
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
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 24c8f164..332947dc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,27 +24,27 @@
<uses-sdk android:minSdkVersion="14" />
- <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
-
+ <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
<application
- android:debuggable="true"
+ android:debuggable="true"
android:icon="@drawable/icon"
android:label="@string/app" >
-
<activity android:name="com.lamerman.FileDialog" />
- <activity android:name=".AboutActivity" />
+ <activity android:name=".AboutFragment" />
<activity android:name=".VPNPreferences" />
<activity android:name=".LogWindow" />
- <activity
- android:name=".OpenVPNClient"
- android:configChanges="orientation|keyboardHidden" >
+ <activity android:name=".MainActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity
+ android:name=".OpenVPNClient"
+ android:configChanges="orientation|keyboardHidden" >
+ </activity>
<service
android:name=".OpenVpnService"