From 39512aaef14bced3bf5116065203054992ee8e25 Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Thu, 14 Jul 2016 12:22:52 +0200 Subject: [PATCH] [android] #5679 - move logo and attribution to the top right [android] #5679 - get correct top margin for logo when saving state of MapView --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 2 +- .../src/main/res/layout/activity_press_for_marker.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 3b8705bb2..a1a160dfc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -516,7 +516,7 @@ public class MapView extends FrameLayout { // UiSettings - Logo outState.putInt(MapboxConstants.STATE_LOGO_GRAVITY, uiSettings.getLogoGravity()); outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_LEFT, uiSettings.getLogoMarginLeft()); - outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_TOP, uiSettings.getCompassMarginTop()); + outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_TOP, uiSettings.getLogoMarginTop()); outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_RIGHT, uiSettings.getLogoMarginRight()); outState.putInt(MapboxConstants.STATE_LOGO_MARGIN_BOTTOM, uiSettings.getLogoMarginBottom()); outState.putBoolean(MapboxConstants.STATE_LOGO_ENABLED, uiSettings.isLogoEnabled()); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml index 7bc26e17c..86a97017b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml @@ -20,6 +20,9 @@ app:center_longitude="5.7215506" app:zoom="11" app:style_url="@string/style_mapbox_streets" + app:logo_gravity="top|end" + app:attribution_gravity="top|end" + app:logo_margin_right="10dp" android:layout_below="@id/toolbar"/>