diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-07-20 10:55:50 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-07-20 10:55:50 +0200 |
| commit | a5928718b99e207ceb8dbce4609662ecef1a26cf (patch) | |
| tree | ecb52c38518a83faa03c2708a0e8f22bae57b87d /res | |
| parent | 3d652a20b5c28b0a424d516161034b23b2523d95 (diff) | |
| parent | 5edc2af535d177edaeda97523a04c6f73fad26a4 (diff) | |
Merge branch 'feature/dashboard-ux' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/eip_service_fragment.xml | 15 | ||||
| -rwxr-xr-x | res/values/strings.xml | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml index 885c78a3..e67f5651 100644 --- a/res/layout/eip_service_fragment.xml +++ b/res/layout/eip_service_fragment.xml @@ -15,19 +15,6 @@ android:clickable="true" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceLarge" /> - - <TextView - android:id="@+id/eipType" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/eipLabel" - android:layout_marginLeft="10dp" - android:layout_marginBottom="10dp" - android:layout_toRightOf="@+id/eipLabel" - android:clickable="true" - android:onClick="toggleEipOverview" - android:text="@string/eip_type_active" - android:textAppearance="?android:attr/textAppearanceMedium" /> <Switch android:id="@+id/eipSwitch" @@ -54,7 +41,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:layout_below="@+id/eipType" + android:layout_below="@+id/eipLabel" android:paddingBottom="10dp" android:paddingLeft="10dp" android:paddingRight="10dp" diff --git a/res/values/strings.xml b/res/values/strings.xml index cef7de1e..532d2379 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -261,8 +261,7 @@ <string name="provider_label_none">No provider configured</string> <string name="eip_settings_button_description">Access EIP connection settings</string> <string name="eip_status">Status unknown</string> - <string name="eip_service_label">EIP:</string> - <string name="eip_type_active">EIP</string> + <string name="eip_service_label">Encrypted Internet</string> <string name="title_activity_configuration_wizard">Configure LEAP</string> <string name="new_provider_button">Select new Provider</string> <string name="introduce_new_provider">Introduce new provider</string> |