diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-04-29 12:47:43 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-04-29 12:47:43 +0200 |
| commit | 8833acbafe00eb2941cfa052cb679fc2684b5290 (patch) | |
| tree | af1e225d222d0e5df02ec5364b16e9efc1a90b25 /app/src/main/res/layout | |
| parent | f008b5ec8e1c74968e4a605d2de5423edf91b854 (diff) | |
Dynamically load user session fragment.
Tests click new button, instead of action bar's.
Fixing more bugs...
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/dashboard.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_user_session.xml | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/app/src/main/res/layout/dashboard.xml b/app/src/main/res/layout/dashboard.xml index 30074b6a..95445d63 100644 --- a/app/src/main/res/layout/dashboard.xml +++ b/app/src/main/res/layout/dashboard.xml @@ -18,19 +18,17 @@ android:singleLine="true" android:text="@string/provider_label_none" android:textAppearance="?android:attr/textAppearanceMedium" /> - - <fragment android:name="se.leap.bitmaskclient.userstatus.UserSessionFragment" + + <LinearLayout android:id="@+id/user_session_fragment" - android:tag="user_session_fragment" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:orientation="horizontal"/> <LinearLayout android:id="@+id/servicesCollection" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="0.11" - android:orientation="vertical" > - </LinearLayout> - + android:orientation="vertical" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_user_session.xml b/app/src/main/res/layout/fragment_user_session.xml index 3b7b23c6..2abd6f22 100644 --- a/app/src/main/res/layout/fragment_user_session.xml +++ b/app/src/main/res/layout/fragment_user_session.xml @@ -1,12 +1,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="horizontal" tools:context="se.leap.bitmaskclient.userstatus.UserSessionFragment"> <LinearLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content"> <ProgressBar |