From 8833acbafe00eb2941cfa052cb679fc2684b5290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 29 Apr 2015 12:47:43 +0200 Subject: Dynamically load user session fragment. Tests click new button, instead of action bar's. Fixing more bugs... --- .../se/leap/bitmaskclient/test/testDashboardIntegration.java | 6 +++++- app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 1 + .../java/se/leap/bitmaskclient/userstatus/SessionDialog.java | 5 +++-- app/src/main/res/layout/dashboard.xml | 12 +++++------- app/src/main/res/layout/fragment_user_session.xml | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) (limited to 'app') diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java index 262310bd..7551091b 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java @@ -169,7 +169,11 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2 - - + android:layout_height="wrap_content" + android:orientation="horizontal"/> - - + android:orientation="vertical" /> 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 @@