From 872d7b5adf2955804317458b236775ee383d5058 Mon Sep 17 00:00:00 2001 From: Dima-1 Date: Fri, 21 Aug 2020 13:48:46 +0300 Subject: [PATCH] Fix merge --- .../plus/measurementtool/MeasurementToolFragment.java | 11 ----------- .../OptionsBottomSheetDialogFragment.java | 3 +++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java index 11900eec45..d25dc18c72 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java @@ -1033,13 +1033,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route } } - private void hideSnapToRoadIcon() { - MapActivity mapActivity = getMapActivity(); - if (mapActivity != null) { - mapActivity.findViewById(R.id.snap_to_road_image_button).setVisibility(View.GONE); - } - } - private void displayRoutePoints() { MeasurementToolLayer measurementLayer = getMeasurementLayer(); GPXFile gpx = editingCtx.getNewGpxData().getGpxFile(); @@ -1762,10 +1755,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route hidePointsList(); } resetAppMode(); - if (editingCtx.isInSnapToRoadMode()) { - resetSnapToRoadMode(); - } - hideSnapToRoadIcon(); if (!editingCtx.isNewData() && !planRouteMode) { GPXFile gpx = editingCtx.getNewGpxData().getGpxFile(); Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity()); diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java index a9cf80ab2f..a4d2240725 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java @@ -3,8 +3,11 @@ package net.osmand.plus.measurementtool; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager;