From 33338d43e0e83329a7c46807e096b8148e19aff7 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sun, 9 Jun 2013 04:09:03 -0600
Subject: Quite basic staring and stopping of VPN

---
 res/layout/eip_overview.xml | 24 ++++++++++++++++++------
 res/values/strings.xml      |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
index 21d4ae38..9cb659f2 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"
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>
-- 
cgit v1.2.3