summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@ma.sdf.org>2013-06-24 19:37:35 +0200
committerParménides GV <parmegv@ma.sdf.org>2013-06-24 19:37:35 +0200
commit50db5b5816476751f39bb7b8adc927562a0cc677 (patch)
treefa8fc602518430137895fbdbaba439f6c3d92321 /res
parent195d5ab2d518f6f3960edd3c636e941830c2664d (diff)
parent304b29d6cb85d710756a56bc9c009429b8407d69 (diff)
Merge branch 'feature/eip' into develop
Diffstat (limited to 'res')
-rw-r--r--res/layout/eip_overview.xml28
-rwxr-xr-xres/values/strings.xml1
2 files changed, 23 insertions, 6 deletions
diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
index 21d4ae38..738c82ef 100644
--- a/res/layout/eip_overview.xml
+++ b/res/layout/eip_overview.xml
@@ -5,18 +5,29 @@
android:layout_marginTop="10dp" >
<TextView
- android:id="@+id/eipType"
+ android:id="@+id/eipLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
+ android:layout_marginLeft="10dp"
+ android:clickable="true"
+ android:onClick="toggleEipOverview"
+ 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_marginLeft="15dp"
- android:layout_toLeftOf="@+id/eipSwitch"
- android:clickable="false"
- android:onClick="toggleOverview"
+ android:layout_toRightOf="@+id/eipLabel"
+ android:clickable="true"
+ android:onClick="toggleEipOverview"
android:text="@string/eip_type_active"
- android:textAppearance="?android:attr/textAppearanceLarge" />
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<Switch
android:id="@+id/eipSwitch"
@@ -27,6 +38,7 @@
android:layout_marginRight="10dp" />
<RelativeLayout
+ android:id="@+id/eipDetail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -44,6 +56,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
+ android:layout_margin="10dp"
android:contentDescription="@string/eip_settings_button_description"
android:src="@drawable/ic_sysbar_quicksettings" />
@@ -53,8 +66,11 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
+ android:clickable="true"
+ android:onClick="showEIPLog"
android:text="@string/eip_status" />
</RelativeLayout>
+
</RelativeLayout> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 804964c1..c0ba6ebd 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -259,6 +259,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="title_activity_configuration_wizard">Configure LEAP</string>
<string name="new_provider_button">Add new Provider</string>