summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--remoteExample/src/main/res/layout/fragment_main.xml12
-rw-r--r--remoteExample/src/main/res/values/strings.xml5
-rw-r--r--vpndialogxposed/src/main/AndroidManifest.xml3
-rw-r--r--vpndialogxposed/src/main/res/layout/vpnapplayout.xml4
-rw-r--r--vpndialogxposed/src/main/res/values/strings.xml2
5 files changed, 15 insertions, 11 deletions
diff --git a/remoteExample/src/main/res/layout/fragment_main.xml b/remoteExample/src/main/res/layout/fragment_main.xml
index 5069780c..e4fa019d 100644
--- a/remoteExample/src/main/res/layout/fragment_main.xml
+++ b/remoteExample/src/main/res/layout/fragment_main.xml
@@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/helloworld"
android:layout_alignParentTop="true"
- android:text="No Status yet" />
+ android:text="@string/no_status_yet" />
<Button
android:id="@+id/startVPN"
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_alignRight="@+id/helloworld"
android:layout_below="@+id/helloworld"
- android:text="Not now"
+ android:text="@string/no_now"
android:visibility="visible" />
<TextView
@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_above="@+id/helloworld"
android:layout_alignParentLeft="true"
- android:text="TextView" />
+ tools:text="TextView" />
<Button
android:id="@+id/getMyIP"
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/startVPN"
- android:text="Show my IP" />
+ android:text="@string/show_my_ip" />
<Button
android:id="@+id/disconnect"
@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/startVPN"
android:layout_toRightOf="@+id/startVPN"
- android:text="Disconnect" />
+ android:text="@string/disconnect" />
<Button
android:id="@+id/startembedded"
@@ -65,6 +65,6 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/getMyIP"
- android:text="Start embedded profile" />
+ android:text="@string/start_embedded" />
</RelativeLayout>
diff --git a/remoteExample/src/main/res/values/strings.xml b/remoteExample/src/main/res/values/strings.xml
index a83b7642..bbaee226 100644
--- a/remoteExample/src/main/res/values/strings.xml
+++ b/remoteExample/src/main/res/values/strings.xml
@@ -5,6 +5,11 @@
<string name="hello_world">Hello world!</string>
<string name="action_settings">Settings</string>
<string name="permission_description">Allows another app to control OpenVPN</string>
+ <string name="no_status_yet">No Status yet</string>
+ <string name="no_now">Not now</string>
+ <string name="show_my_ip">Show my IP</string>
+ <string name="disconnect">Disconnect</string>
+ <string name="start_embedded">Start embedded profile</string>
</resources>
diff --git a/vpndialogxposed/src/main/AndroidManifest.xml b/vpndialogxposed/src/main/AndroidManifest.xml
index 2a58277d..bff95c63 100644
--- a/vpndialogxposed/src/main/AndroidManifest.xml
+++ b/vpndialogxposed/src/main/AndroidManifest.xml
@@ -2,9 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.blinkt.vpndialogxposed" >
- <uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="17"/>
<application
android:allowBackup="true"
diff --git a/vpndialogxposed/src/main/res/layout/vpnapplayout.xml b/vpndialogxposed/src/main/res/layout/vpnapplayout.xml
index 3042ee2b..af2a824e 100644
--- a/vpndialogxposed/src/main/res/layout/vpnapplayout.xml
+++ b/vpndialogxposed/src/main/res/layout/vpnapplayout.xml
@@ -9,7 +9,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Select the apps that should be allowed to use the VpnService API without user confirmation"/>
+ android:text="@string/select_apps"/>
<ListView
@@ -27,7 +27,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="No Apps using the VPNService API found"
+ android:text="@string/no_apps_found"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/vpndialogxposed/src/main/res/values/strings.xml b/vpndialogxposed/src/main/res/values/strings.xml
index 2afcc0c2..6eace130 100644
--- a/vpndialogxposed/src/main/res/values/strings.xml
+++ b/vpndialogxposed/src/main/res/values/strings.xml
@@ -2,5 +2,7 @@
<resources>
<string name="app_name">VpnDialog Xposed Module</string>
+ <string name="select_apps">Select the apps that should be allowed to use the VpnService API without user confirmation</string>
+ <string name="no_apps_found">No Apps using the VPNService API found</string>
</resources>