summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2017-07-28 19:36:13 +0200
committerGitHub <noreply@github.com>2017-07-28 19:36:13 +0200
commit685b8b2c84e47d8126e924ff3fddc22a96237680 (patch)
treed8b72c5af496f1a7bf57b3661822501a3b7a8560 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
parentba7574ec51e2cfd4a55565d5a8337c47f1784bc2 (diff)
downloadqtlocation-mapboxgl-685b8b2c84e47d8126e924ff3fddc22a96237680.tar.gz
Solve lint issues, reduce baseline (#9627)
* [android] - fix lint issues SDK
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml')
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml15
1 files changed, 6 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
index a0de31ee48..cd4aa4bdef 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
@@ -1,19 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
<com.mapbox.mapboxsdk.maps.MapView
android:id="@id/mapView"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"/>
<View
android:layout_width="@dimen/map_padding_left"
android:layout_height="match_parent"
android:alpha="0.5"
- android:background="@color/mapbox_blue" />
+ android:background="@color/mapbox_blue"/>
<View
android:layout_width="match_parent"
@@ -24,13 +21,13 @@
android:layout_marginRight="@dimen/map_padding_right"
android:layout_marginStart="@dimen/map_padding_left"
android:alpha="0.5"
- android:background="@color/mapbox_blue" />
+ android:background="@color/mapbox_blue"/>
<View
android:layout_width="@dimen/map_padding_right"
android:layout_height="match_parent"
android:layout_gravity="end"
android:alpha="0.5"
- android:background="@color/mapbox_blue" />
+ android:background="@color/mapbox_blue"/>
-</FrameLayout>
+</merge>