summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-07-20 00:39:10 +0200
committerParménides GV <parmegv@sdf.org>2013-07-20 00:39:10 +0200
commit3d652a20b5c28b0a424d516161034b23b2523d95 (patch)
tree0368ca6f91ebbd55f2aaaf56eee0d70beaccb861 /res
parentc7f73c9ef8f64351d4e462106a2ab5d216810684 (diff)
parentf0c42391501aa646c5d65df5e19dbbd36b19b970 (diff)
Merge branch 'feature/eip-control-ux' into develop
Diffstat (limited to 'res')
-rw-r--r--res/layout/client_dashboard.xml11
-rw-r--r--res/layout/eip_service_fragment.xml (renamed from res/layout/eip_overview.xml)17
-rwxr-xr-xres/values/strings.xml5
3 files changed, 19 insertions, 14 deletions
diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml
index 9d9b7a40..9f05cfbc 100644
--- a/res/layout/client_dashboard.xml
+++ b/res/layout/client_dashboard.xml
@@ -65,15 +65,6 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.11"
- android:orientation="vertical" >
-
- <ViewStub
- android:id="@+id/eipOverviewStub"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:inflatedId="@+id/eipOverview"
- android:layout="@layout/eip_overview" />
-
- </LinearLayout>
+ android:orientation="vertical" />
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/eip_overview.xml b/res/layout/eip_service_fragment.xml
index 738c82ef..885c78a3 100644
--- a/res/layout/eip_overview.xml
+++ b/res/layout/eip_service_fragment.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/eipServiceFragment"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginTop="10dp" >
<TextView
@@ -12,7 +13,6 @@
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" />
@@ -36,6 +36,17 @@
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginRight="10dp" />
+
+ <ProgressBar
+ android:id="@+id/eipProgress"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@android:style/Widget.Holo.ProgressBar.Horizontal"
+ android:indeterminate="true"
+ android:visibility="gone"
+ android:layout_below="@id/eipLabel"
+ android:layout_marginLeft="15dp"
+ android:layout_marginRight="15dp" />
<RelativeLayout
android:id="@+id/eipDetail"
@@ -67,10 +78,8 @@
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 3a178037..cef7de1e 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,5 +314,10 @@
<string name="log_out_failed_message">Didn\'t logged out.</string>
<string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
<string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
+ <string name="eip_status_start_pending">Initiating connection</string>
+ <string name="eip_cancel_connect_title">Cancel connection?</string>
+ <string name="eip_cancel_connect_text">There is a connection attempt in progress. Do you wish to cancel it?</string>
+ <string name="eip_cancel_connect_cancel">Yes</string>
+ <string name="eip_cancel_connect_false">No</string>
</resources>