From 1688e42cf2208c7b5134fdeda9ecf9435865ecc5 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Tue, 3 Mar 2020 15:11:54 +0200 Subject: [PATCH 01/10] fix last item visibility in long list --- OsmAnd/res/layout/fragment_import.xml | 1 - .../net/osmand/plus/settings/ImportSettingsFragment.java | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/layout/fragment_import.xml b/OsmAnd/res/layout/fragment_import.xml index b8fba79615..8a469f97d0 100644 --- a/OsmAnd/res/layout/fragment_import.xml +++ b/OsmAnd/res/layout/fragment_import.xml @@ -16,7 +16,6 @@ android:focusable="false" android:groupIndicator="@android:color/transparent" android:listSelector="@android:color/transparent" - android:paddingBottom="@dimen/dialog_button_ex_height" osmand:layout_behavior="@string/appbar_scrolling_view_behavior" /> = 21) { AndroidUtils.addStatusBarPadding21v(app, root); } + final int buttonsHeight = app.getResources().getDimensionPixelSize(R.dimen.dialog_button_ex_height); + expandableList.setPadding(0, 0, 0, buttonsHeight * 2); + expandableList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() { + @Override + public boolean onGroupClick(ExpandableListView expandableListView, View view, int i, long l) { + expandableList.setPadding(0, 0, 0, buttonsHeight); + return false; + } + }); return root; } From 4ffbeaacb2c7e767820438429ffe9e5712900dc6 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Tue, 3 Mar 2020 16:10:59 +0200 Subject: [PATCH 02/10] fix list padding --- .../plus/settings/ImportSettingsFragment.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java index 6c4e22caaf..ce8c218761 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java @@ -16,6 +16,7 @@ import android.text.style.StyleSpan; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.ViewTreeObserver; import android.widget.ExpandableListView; import android.widget.LinearLayout; import android.widget.ProgressBar; @@ -127,13 +128,20 @@ public class ImportSettingsFragment extends BaseOsmAndFragment if (Build.VERSION.SDK_INT >= 21) { AndroidUtils.addStatusBarPadding21v(app, root); } - final int buttonsHeight = app.getResources().getDimensionPixelSize(R.dimen.dialog_button_ex_height); - expandableList.setPadding(0, 0, 0, buttonsHeight * 2); - expandableList.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() { + ViewTreeObserver treeObserver = buttonsContainer.getViewTreeObserver(); + treeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { @Override - public boolean onGroupClick(ExpandableListView expandableListView, View view, int i, long l) { - expandableList.setPadding(0, 0, 0, buttonsHeight); - return false; + public void onGlobalLayout() { + if (buttonsContainer != null) { + ViewTreeObserver vts = buttonsContainer.getViewTreeObserver(); + int height = buttonsContainer.getMeasuredHeight(); + expandableList.setPadding(0, 0, 0, height); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + vts.removeOnGlobalLayoutListener(this); + } else { + vts.removeGlobalOnLayoutListener(this); + } + } } }); return root; From dbe6a560c2c85daf208aec908b51266353ee548f Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Tue, 3 Mar 2020 16:23:51 +0200 Subject: [PATCH 03/10] fix routing and render icons in duplicates --- .../osmand/plus/settings/DuplicatesSettingsAdapter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java index 3bb9f9ee51..6c6211c20a 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java @@ -112,13 +112,12 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter Date: Tue, 3 Mar 2020 16:46:04 +0200 Subject: [PATCH 04/10] fix smooth scroll on duplicates screen --- .../src/net/osmand/plus/settings/ImportDuplicatesFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java b/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java index f8c97dd82a..bb4cd50100 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java @@ -7,6 +7,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.CollapsingToolbarLayout; import android.support.v4.app.FragmentManager; +import android.support.v4.view.ViewCompat; import android.support.v4.widget.NestedScrollView; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -124,6 +125,7 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment implements View keepBothBtn.setOnClickListener(this); replaceAllBtn.setOnClickListener(this); list = root.findViewById(R.id.list); + ViewCompat.setNestedScrollingEnabled(list, false); ViewTreeObserver treeObserver = buttonsContainer.getViewTreeObserver(); treeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { @Override From 429e4ca6cfcb7286a929c1758db9ed21c4203f9b Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Tue, 3 Mar 2020 16:55:44 +0200 Subject: [PATCH 05/10] add map sources icon --- .../osmand/plus/settings/DuplicatesSettingsAdapter.java | 8 +------- .../plus/settings/ExportImportSettingsAdapter.java | 9 +-------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java index 6c6211c20a..5e409364c9 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java @@ -90,25 +90,21 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter Date: Tue, 3 Mar 2020 17:28:13 +0200 Subject: [PATCH 06/10] colorize selected items icons --- .../settings/DuplicatesSettingsAdapter.java | 18 ++++---- .../settings/ExportImportSettingsAdapter.java | 41 +++++++++++++------ 2 files changed, 39 insertions(+), 20 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java index 5e409364c9..f0999fb9bb 100644 --- a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java @@ -36,12 +36,16 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter items; + private int activeColorRes; DuplicatesSettingsAdapter(OsmandApplication app, List items, boolean nightMode) { this.app = app; this.items = items; this.nightMode = nightMode; - this.uiUtilities = app.getUIUtilities(); + uiUtilities = app.getUIUtilities(); + activeColorRes = nightMode + ? R.color.icon_color_active_dark + : R.color.icon_color_active_light; } @NonNull @@ -93,30 +97,30 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter dataToOperate; private List dataList; private boolean nightMode; private boolean importState; private int profileColor; + private int activeColorRes; ExportImportSettingsAdapter(OsmandApplication app, boolean nightMode, boolean importState) { this.app = app; this.nightMode = nightMode; this.importState = importState; - this.dataList = new ArrayList<>(); - this.dataToOperate = new ArrayList<>(); - this.profileColor = app.getSettings().getApplicationMode().getIconColorInfo().getColor(nightMode); + dataList = new ArrayList<>(); + dataToOperate = new ArrayList<>(); + profileColor = app.getSettings().getApplicationMode().getIconColorInfo().getColor(nightMode); + uiUtilities = app.getUIUtilities(); + activeColorRes = nightMode + ? R.color.icon_color_active_dark + : R.color.icon_color_active_light; } @Override @@ -78,7 +84,7 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { lineDivider.setVisibility(importState || isExpanded || isLastGroup ? View.GONE : View.VISIBLE); cardTopDivider.setVisibility(importState ? View.VISIBLE : View.GONE); cardBottomDivider.setVisibility(importState && !isExpanded ? View.VISIBLE : View.GONE); - CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(ContextCompat.getColor(app, profileColor))); + CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(ContextCompat.getColor(app, activeColorRes))); final List listItems = dataList.get(groupPosition).getItems(); subTextTv.setText(String.valueOf(listItems.size())); @@ -125,6 +131,7 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { final Object currentItem = dataList.get(groupPosition).getItems().get(childPosition); boolean isLastGroup = groupPosition == getGroupCount() - 1; + boolean itemSelected = dataToOperate.contains(currentItem); final AdditionalDataWrapper.Type type = dataList.get(groupPosition).getType(); TextView title = child.findViewById(R.id.title_tv); @@ -136,9 +143,9 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { lineDivider.setVisibility(!importState && isLastChild && !isLastGroup ? View.VISIBLE : View.GONE); cardBottomDivider.setVisibility(importState && isLastChild ? View.VISIBLE : View.GONE); - CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(ContextCompat.getColor(app, profileColor))); + CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(ContextCompat.getColor(app, activeColorRes))); - checkBox.setChecked(dataToOperate.contains(currentItem)); + checkBox.setChecked(itemSelected); checkBox.setClickable(false); child.setOnClickListener(new View.OnClickListener() { @Override @@ -172,42 +179,42 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { } int profileIconRes = AndroidUtils.getDrawableId(app, ((ApplicationMode.ApplicationModeBean) currentItem).iconName); ProfileIconColors iconColor = ((ApplicationMode.ApplicationModeBean) currentItem).iconColor; - icon.setImageDrawable(app.getUIUtilities().getIcon(profileIconRes, iconColor.getColor(nightMode))); + icon.setImageDrawable(uiUtilities.getIcon(profileIconRes, iconColor.getColor(nightMode))); break; case QUICK_ACTIONS: title.setText(((QuickAction) currentItem).getName(app.getApplicationContext())); - icon.setImageDrawable(app.getUIUtilities().getIcon(((QuickAction) currentItem).getIconRes(), nightMode)); + setupIcon(icon, ((QuickAction) currentItem).getIconRes(), itemSelected); subText.setVisibility(View.GONE); break; case POI_TYPES: title.setText(((PoiUIFilter) currentItem).getName()); int iconRes = RenderingIcons.getBigIconResourceId(((PoiUIFilter) currentItem).getIconId()); - icon.setImageDrawable(app.getUIUtilities().getIcon(iconRes != 0 ? iconRes : R.drawable.ic_person, profileColor)); + setupIcon(icon, iconRes != 0 ? iconRes : R.drawable.ic_person, itemSelected); subText.setVisibility(View.GONE); break; case MAP_SOURCES: title.setText(((ITileSource) currentItem).getName()); - icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_map, nightMode)); + setupIcon(icon, R.drawable.ic_map, itemSelected); subText.setVisibility(View.GONE); break; case CUSTOM_RENDER_STYLE: String renderName = ((File) currentItem).getName(); renderName = renderName.replace('_', ' ').replaceAll(IndexConstants.RENDERER_INDEX_EXT, ""); title.setText(renderName); - icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_map_style, nightMode)); + setupIcon(icon, R.drawable.ic_action_map_style, itemSelected); subText.setVisibility(View.GONE); break; case CUSTOM_ROUTING: String routingName = ((File) currentItem).getName(); routingName = routingName.replace('_', ' ').replaceAll(".xml", ""); title.setText(routingName); - icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_route_distance, nightMode)); + setupIcon(icon, R.drawable.ic_action_route_distance, itemSelected); subText.setVisibility(View.GONE); break; case AVOID_ROADS: AvoidRoadInfo avoidRoadInfo = (AvoidRoadInfo) currentItem; title.setText(avoidRoadInfo.name); - icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_alert, nightMode)); + setupIcon(icon, R.drawable.ic_action_alert, itemSelected); subText.setVisibility(View.GONE); break; default: @@ -277,6 +284,14 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { } } + private void setupIcon(ImageView icon, int iconRes, boolean itemSelected) { + if (itemSelected) { + icon.setImageDrawable(uiUtilities.getIcon(iconRes, activeColorRes)); + } else { + icon.setImageDrawable(uiUtilities.getIcon(iconRes, nightMode)); + } + } + public void updateSettingsList(List settingsList) { this.dataList = settingsList; notifyDataSetChanged(); From 2ceb6821c989ad318eafdf81e04caf07b098103e Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Wed, 4 Mar 2020 11:41:07 +0200 Subject: [PATCH 07/10] fix drawer above import screen --- OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java index 9cb66f91d9..af8ed92876 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java @@ -788,6 +788,9 @@ public class ImportHelper { if (succeed) { FragmentManager fragmentManager = activity.getSupportFragmentManager(); if (fragmentManager != null) { + if (activity instanceof MapActivity) { + ((MapActivity) activity).closeDrawer(); + } ImportSettingsFragment.showInstance(fragmentManager, items, file); } } else if (empty) { From f4c70db6173f35629e2b660b4c7e439f30a5bb34 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 13 Mar 2020 16:58:23 +0200 Subject: [PATCH 08/10] resolve conflicts / refactor ExportImportSettingsAdapter --- OsmAnd/res/values/strings.xml | 1 - .../osmand/plus/settings/ExportImportSettingsAdapter.java | 5 +---- .../net/osmand/plus/settings/ImportDuplicatesFragment.java | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 208fcdd3d9..eb98de459c 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -16,7 +16,6 @@ Restore all profile settings? Saving new profile Could not back up profile. - Import rendering file Importing data from %1$s Importing OsmAnd check %1$s for duplicates with existing items in the application.\n\nIt may take some time. diff --git a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java index 22d485bb8d..34b00a5d2b 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java +++ b/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java @@ -37,6 +37,7 @@ import java.util.Map; import static net.osmand.view.ThreeStateCheckbox.State.CHECKED; import static net.osmand.view.ThreeStateCheckbox.State.MISC; +import static net.osmand.view.ThreeStateCheckbox.State.UNCHECKED; class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { @@ -47,7 +48,6 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { private List itemsTypes; private boolean nightMode; private boolean importState; - private int profileColor; private int activeColorRes; ExportImportSettingsAdapter(OsmandApplication app, boolean nightMode, boolean importState) { @@ -57,10 +57,7 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter { this.itemsMap = new HashMap<>(); this.itemsTypes = new ArrayList<>(); this.dataToOperate = new ArrayList<>(); - this.profileColor = app.getSettings().getApplicationMode().getIconColorInfo().getColor(nightMode); - dataList = new ArrayList<>(); dataToOperate = new ArrayList<>(); - profileColor = app.getSettings().getApplicationMode().getIconColorInfo().getColor(nightMode); uiUtilities = app.getUIUtilities(); activeColorRes = nightMode ? R.color.icon_color_active_dark diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java b/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java index b7bd2de3b3..08f9346c21 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java @@ -15,6 +15,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; +import androidx.core.view.ViewCompat; import androidx.core.widget.NestedScrollView; import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; From 5580a4fcda627369cff5dee504bf80d7d4fc6ee2 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 13 Mar 2020 18:33:12 +0200 Subject: [PATCH 09/10] drawer over fragment fix / fix list padding on import complete screen --- OsmAnd/res/layout/fragment_import_complete.xml | 6 ++++++ .../plus/settings/ImportCompleteFragment.java | 17 +++++++++++++++++ .../plus/settings/ImportSettingsFragment.java | 11 +++++++++++ 3 files changed, 34 insertions(+) diff --git a/OsmAnd/res/layout/fragment_import_complete.xml b/OsmAnd/res/layout/fragment_import_complete.xml index b0af290996..7983465d43 100644 --- a/OsmAnd/res/layout/fragment_import_complete.xml +++ b/OsmAnd/res/layout/fragment_import_complete.xml @@ -56,6 +56,7 @@ diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java b/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java index 725281c31f..2d437aae94 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportCompleteFragment.java @@ -8,6 +8,8 @@ import android.text.style.StyleSpan; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.ViewTreeObserver; +import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; @@ -71,6 +73,7 @@ public class ImportCompleteFragment extends BaseOsmAndFragment { View root = inflater.inflate(R.layout.fragment_import_complete, container, false); TextView description = root.findViewById(R.id.description); TextView btnClose = root.findViewById(R.id.button_close); + final LinearLayout buttonContainer = root.findViewById(R.id.button_container); recyclerView = root.findViewById(R.id.list); description.setText(UiUtilities.createSpannableString( String.format(getString(R.string.import_complete_description), fileName), @@ -86,6 +89,20 @@ public class ImportCompleteFragment extends BaseOsmAndFragment { if (Build.VERSION.SDK_INT >= 21) { AndroidUtils.addStatusBarPadding21v(app, root); } + ViewTreeObserver treeObserver = buttonContainer.getViewTreeObserver(); + treeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + ViewTreeObserver vts = buttonContainer.getViewTreeObserver(); + int height = buttonContainer.getMeasuredHeight(); + recyclerView.setPadding(0, 0, 0, height); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + vts.removeOnGlobalLayoutListener(this); + } else { + vts.removeGlobalOnLayoutListener(this); + } + } + }); return root; } diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java index 5eec5f00ad..615644f0de 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java @@ -1,5 +1,6 @@ package net.osmand.plus.settings; +import android.app.Activity; import android.content.Context; import android.content.DialogInterface; import android.graphics.Typeface; @@ -37,6 +38,7 @@ import net.osmand.plus.SQLiteTileSource; import net.osmand.plus.SettingsHelper; import net.osmand.plus.SettingsHelper.*; import net.osmand.plus.UiUtilities; +import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.BaseOsmAndFragment; import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo; import net.osmand.plus.poi.PoiUIFilter; @@ -184,6 +186,15 @@ public class ImportSettingsFragment extends BaseOsmAndFragment outState.putLong(DUPLICATES_START_TIME_KEY, duplicateStartTime); } + @Override + public void onResume() { + super.onResume(); + Activity activity = getActivity(); + if (activity instanceof MapActivity) { + ((MapActivity) activity).disableDrawer(); + } + } + @Override public void onClick(View view) { switch (view.getId()) { From 9b7a3431dc52e93995e103f168b3335245c43e40 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 13 Mar 2020 18:50:12 +0200 Subject: [PATCH 10/10] closeDrawer --- OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java index 615644f0de..e3cc3226e9 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java @@ -191,7 +191,7 @@ public class ImportSettingsFragment extends BaseOsmAndFragment super.onResume(); Activity activity = getActivity(); if (activity instanceof MapActivity) { - ((MapActivity) activity).disableDrawer(); + ((MapActivity) activity).closeDrawer(); } }