diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-03-13 15:46:15 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-03-13 15:46:15 +0100 |
| commit | f476425c42a08e92ecb0cea99908e9b8d635fa69 (patch) | |
| tree | 66eda60eaed4bce6e25e3107b16907c4601b875e /app/src/main/res/layout/dashboard.xml | |
| parent | c5124635b8272d08538889c1a9edfafe4acaf759 (diff) | |
| parent | b9120adba28b5d691375ece5a919357e54e86a7f (diff) | |
Merge branch 'bug/Switching-orientation-doesn't-restore-previous-UI-#6780' into develop
Diffstat (limited to 'app/src/main/res/layout/dashboard.xml')
| -rw-r--r-- | app/src/main/res/layout/dashboard.xml | 29 |
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" |