summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2015-10-22 11:29:35 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2015-10-22 14:40:55 +0200
commit19c58ec4988b109748bb25ffca49498f26e11547 (patch)
tree9d241f64e0c33fadf83b18f0697c97a096a39544 /android
parentd4aebbf879082ff8d5fd38c286a9ec460cfb1a04 (diff)
downloadqtlocation-mapboxgl-19c58ec4988b109748bb25ffca49498f26e11547.tar.gz
[android] #2640 - replaced RelateLayout with merge tag
Diffstat (limited to 'android')
-rw-r--r--android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml7
1 files changed, 2 insertions, 5 deletions
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml b/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml
index 47c5d90d79..496766ea77 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/infowindow_content"
@@ -49,5 +46,5 @@
android:layout_height="8dp"
android:layout_below="@+id/infowindow_content" />
-</RelativeLayout>
+</merge>