diff options
author | Parménides GV <parmegv@sdf.org> | 2014-12-09 21:48:32 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-12-09 21:48:32 +0100 |
commit | 56fe0400b8983ce57112ed5a0f993985a87741c0 (patch) | |
tree | e1fe21f8dabe2fdd4180b74ccd20553e345c73be /app/src/main/res/layout/eip_service_fragment.xml | |
parent | d67d127aa9691fbad10f93294c6b0b7e45406ed8 (diff) | |
parent | 60adae615458f42fe7a36fe9c4faf90e3e463f95 (diff) |
Merge branch 'bug/Providers-vanish-from-Configuration-wizard-if-something-fails-during-its-setup-#6472' into develop
Diffstat (limited to 'app/src/main/res/layout/eip_service_fragment.xml')
-rw-r--r-- | app/src/main/res/layout/eip_service_fragment.xml | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index be2aa791..64d22147 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -22,8 +22,8 @@ android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:layout_marginRight="10dp" /> - - <ProgressBar + + <ProgressBar android:id="@+id/eipProgress" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -34,38 +34,18 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp" /> - <RelativeLayout - android:id="@+id/eipDetail" - android:layout_width="match_parent" + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/eipLabel" + android:layout_below="@id/eipProgress" + android:layout_centerVertical="true" + android:paddingTop="5dp" android:paddingBottom="10dp" android:paddingLeft="10dp" android:paddingRight="10dp" - android:paddingTop="10dp" - android:visibility="gone" > - - <ImageView - android:id="@+id/eipSettings" - android:layout_width="wrap_content" - 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" /> - - <TextView - android:id="@+id/status_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:clickable="true" - android:text="@string/eip_state_not_connected" /> - - </RelativeLayout> + android:clickable="true" + android:text="@string/eip_state_not_connected" /> </RelativeLayout> |