altosdroid: Display online/offline maps in same tab

[fw/altos] / altosdroid / res / layout / tab_map_offline.xml

diff --git a/altosdroid/res/layout/tab_map_offline.xml b/altosdroid/res/layout/tab_map_offline.xml
index e6f134d8c2adcfcf3d3c1c398cec8be8ff7057e9..1b0f28a7d0bc0ac1f3be4df0b4da65b90a51fc23 100644 (file)
--- a/altosdroid/res/layout/tab_map_offline.xml
+++ b/altosdroid/res/layout/tab_map_offline.xml
@@ -20,11 +20,25 @@
        android:layout_height="match_parent"
        android:orientation="vertical" >
 
-  <org.altusmetrum.AltosDroid.AltosMapView android:id="@+id/map_view_offline"
-                                          android:layout_width="fill_parent"
-                                          android:layout_height="wrap_content"
-                                          android:layout_weight="1"
-                                          />
+  <FrameLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal"
+      android:layout_weight="1">
+    <LinearLayout
+       android:id="@+id/map_online"
+       android:orientation="horizontal"
+       android:layout_width="fill_parent"
+       android:layout_height="fill_parent"
+       android:layout_weight="1">
+    </LinearLayout>
+    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_view_offline"
+                                               android:layout_width="fill_parent"
+                                               android:layout_height="wrap_content"
+                                               android:layout_weight="1"
+                                               />
+  </FrameLayout>
   
   <LinearLayout
       xmlns:android="http://schemas.android.com/apk/res/android"