Skip to content
Snippets Groups Projects
Commit 60520ab3 authored by Aline Bonnet's avatar Aline Bonnet Committed by gerrit2
Browse files

ui: fix display of devices list


In the account management, the devices list is displayed on a single
line.
This commit fix this behaviour. If there are several devices, there is
now one line for each.

Change-Id: I2703d7b62ad5ca4e30735b2a7538f924679d5df3
Reviewed-by: default avatarAlexandre Lision <alexandre.lision@savoirfairelinux.com>
parent 38a58c91
Branches
Tags
No related merge requests found
...@@ -20,16 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -20,16 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<cx.ring.views.BoundedScrollView <cx.ring.views.BoundedRelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="50dp" android:layout_gravity="center_horizontal"
android:layout_gravity="center_horizontal"> android:layout_marginBottom="50dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/ring_account_status_container" android:id="@+id/ring_account_status_container"
...@@ -55,9 +50,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -55,9 +50,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/account_alias_txt" android:layout_below="@id/account_alias_txt"
android:textStyle="bold"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Small.Inverse" android:textAppearance="@style/Base.TextAppearance.AppCompat.Small.Inverse"
android:textColor="@color/white" android:textColor="@color/white"
android:textStyle="bold"
tools:text="Registered" /> tools:text="Registered" />
...@@ -99,8 +94,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -99,8 +94,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:textStyle="bold"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textStyle="bold"
tools:text="ring:8F29045378ACA68F2ACA2346078ACA68F2ACA290" /> tools:text="ring:8F29045378ACA68F2ACA2346078ACA68F2ACA290" />
<LinearLayout <LinearLayout
...@@ -237,8 +232,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -237,8 +232,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </cx.ring.views.BoundedRelativeLayout>
</cx.ring.views.BoundedScrollView>
<include <include
layout="@layout/add_new_device_layout" layout="@layout/add_new_device_layout"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment