diff options
author | Parménides GV <parmegv@sdf.org> | 2015-06-08 10:49:33 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-06-08 10:49:33 +0200 |
commit | 471f9a8dba225921cf1a555ad6645305a860c7fb (patch) | |
tree | e2202f0ab72e09467b0d2a15afd8bfafc9b5fae5 /app/remoteExample/src/main/res/values | |
parent | 145332cc9b4e5af62299dedf45c436fedbe05fec (diff) | |
parent | 8d39fbdb4980c95268249f21f3c6b8e36b22cf90 (diff) |
Merge branch 'develop' into release-0.9.4
Diffstat (limited to 'app/remoteExample/src/main/res/values')
-rw-r--r-- | app/remoteExample/src/main/res/values/dimens.xml | 6 | ||||
-rw-r--r-- | app/remoteExample/src/main/res/values/strings-icsopenvpn.xml | 16 | ||||
-rw-r--r-- | app/remoteExample/src/main/res/values/styles.xml | 8 |
3 files changed, 30 insertions, 0 deletions
diff --git a/app/remoteExample/src/main/res/values/dimens.xml b/app/remoteExample/src/main/res/values/dimens.xml new file mode 100644 index 00000000..a0171a70 --- /dev/null +++ b/app/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/app/remoteExample/src/main/res/values/strings-icsopenvpn.xml b/app/remoteExample/src/main/res/values/strings-icsopenvpn.xml new file mode 100644 index 00000000..49d4978d --- /dev/null +++ b/app/remoteExample/src/main/res/values/strings-icsopenvpn.xml @@ -0,0 +1,16 @@ +<?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> + <string name="addNew">Add new Profile</string> + + +</resources> diff --git a/app/remoteExample/src/main/res/values/styles.xml b/app/remoteExample/src/main/res/values/styles.xml new file mode 100644 index 00000000..ff6c9d2c --- /dev/null +++ b/app/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> |