summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout/dashboard.xml
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-10 11:19:03 +0200
committerParménides GV <parmegv@sdf.org>2015-04-10 11:19:03 +0200
commit1f41fec6765e49838141ad29151713c7ac3dd17c (patch)
treed4c63d5bbb8e51d91d75179ad01abd9a7565badc /app/src/main/res/layout/dashboard.xml
parentc198dbd9dd583d980ae7e70118f67d09bed8de55 (diff)
parentfe95b7693f0f1f90d23ba2596ad3b11195efb11d (diff)
Merge branch 'develop'0.9.3
Diffstat (limited to 'app/src/main/res/layout/dashboard.xml')
-rw-r--r--app/src/main/res/layout/dashboard.xml29
1 files changed, 21 insertions, 8 deletions
diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml
index 67a1122f..f4269fe2 100644
--- a/app/src/main/res/layout/dashboard.xml
+++ b/app/src/main/res/layout/dashboard.xml
@@ -16,7 +16,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:ellipsize="marquee"
- android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/provider_label"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -28,19 +27,33 @@
android:textSize="28sp"
android:layout_marginLeft="10dp"
android:ellipsize="marquee"
- android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/provider_label_none"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
- <View
- android:layout_width="wrap_content"
- android:layout_height="2dp"
- android:layout_marginBottom="15dp"
- android:background="@android:drawable/divider_horizontal_bright" />
-
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <ProgressBar
+ android:id="@+id/user_session_status_progress"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:indeterminate="true"
+ android:visibility="gone"/>
+ <TextView
+ android:id="@+id/user_session_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:layout_marginLeft="10dp"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ />
+ </LinearLayout>
+
<LinearLayout
android:id="@+id/servicesCollection"
android:layout_width="match_parent"