summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/remoteExample/src/main
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-06-13 12:21:38 +0200
committerParménides GV <parmegv@sdf.org>2014-06-13 12:21:38 +0200
commitd09435a9d2adb0d0cafa0b1f9f6cfe326346cbc6 (patch)
tree946278cd836aa6af639675f4eb5ec7378d783dd8 /ics-openvpn-stripped/remoteExample/src/main
parent5d47fde84a03acb1201f8650c55dc0cd981df679 (diff)
parent3a71bc9e4aa4296f460e2e3c55de74c9852477ad (diff)
Merge branch 'develop' into release-0.5.2
Diffstat (limited to 'ics-openvpn-stripped/remoteExample/src/main')
-rw-r--r--ics-openvpn-stripped/remoteExample/src/main/res/values-w820dp/dimens.xml6
-rw-r--r--ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml6
-rw-r--r--ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml15
-rw-r--r--ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml8
4 files changed, 35 insertions, 0 deletions
diff --git a/ics-openvpn-stripped/remoteExample/src/main/res/values-w820dp/dimens.xml b/ics-openvpn-stripped/remoteExample/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..63fc8164
--- /dev/null
+++ b/ics-openvpn-stripped/remoteExample/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+ <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+ (such as screen margins) for screens with more than 820dp of available width. This
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+ <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml b/ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..a0171a70
--- /dev/null
+++ b/ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="activity_horizontal_margin">16dp</dimen>
+ <dimen name="activity_vertical_margin">16dp</dimen>
+
+ </resources>
diff --git a/ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml b/ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml
new file mode 100644
index 00000000..bbaee226
--- /dev/null
+++ b/ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <string name="app_name">OpenVPN Remote</string>
+ <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/ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml b/ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml
new file mode 100644
index 00000000..ff6c9d2c
--- /dev/null
+++ b/ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+ <!-- Base application theme. -->
+ <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+ <!-- Customize your theme here. -->
+ </style>
+
+</resources>