summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-07 12:55:09 +0200
committerParménides GV <parmegv@sdf.org>2015-04-07 12:55:09 +0200
commitfe85613a73d48ebeadc7d35e8d346d68bd0b4fc0 (patch)
tree9d8cdc69998630daab2ba50e874de66a4e91f7c9 /app/src/main/res
parent0c6462f5a0451d632a600bd06f2f9d297d4a03a4 (diff)
Move switch down
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/eip_service_fragment.xml18
-rw-r--r--app/src/main/res/values-es/strings.xml2
-rw-r--r--app/src/main/res/values/strings.xml2
3 files changed, 11 insertions, 11 deletions
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 64d22147..6adcfab0 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -13,15 +13,7 @@
android:layout_marginLeft="10dp"
android:clickable="true"
android:text="@string/eip_service_label"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <Switch
- android:id="@+id/eipSwitch"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_marginRight="10dp" />
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<ProgressBar
android:id="@+id/eipProgress"
@@ -48,4 +40,12 @@
android:clickable="true"
android:text="@string/eip_state_not_connected" />
+ <Switch
+ android:id="@+id/eipSwitch"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignTop="@+id/status_message"
+ android:layout_toRightOf="@+id/status_message"
+ android:layout_toEndOf="@+id/status_message" />
+
</RelativeLayout>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 249a9720..b9c01afa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -17,7 +17,7 @@
<string name="provider_label">Proveedor:</string>
<string name="provider_label_none">Ningún proveedor configurado</string>
<string name="status_unknown">Estado no definido.</string>
- <string name="eip_service_label">Acceso a Internet Encriptado</string>
+ <string name="eip_service_label">Acceso a Internet Encriptado con VPN</string>
<string name="configuration_wizard_title">Elige un proveedor</string>
<string name="new_provider_button">Nuevo proveedor</string>
<string name="introduce_new_provider">Añadir un nuevo proveedor</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1e33928..47ff2832 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
<string name="provider_label">Provider:</string>
<string name="provider_label_none">No provider configured</string>
<string name="status_unknown">Status unknown.</string>
- <string name="eip_service_label">Encrypted Internet</string>
+ <string name="eip_service_label">VPN Encrypted Internet Access</string>
<string name="configuration_wizard_title">Select a service provider</string>
<string name="new_provider_button">Add new Provider</string>
<string name="introduce_new_provider">Add a new service provider</string>