Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9029 from osmandapp/profile_configure_menu_items_fix

Browse source 
not count show and render headers
This commit is contained in:
vshcherb 2020-05-20 18:22:06 +02:00 committed by GitHub
commit 44ad14fc82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuRootFragment.java
View file

@ -51,6 +51,8 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID; import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_DIVIDER_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_RENDERING_CATEGORY_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.SHOW_CATEGORY_ID;
public class ConfigureMenuRootFragment extends BaseOsmAndFragment { public class ConfigureMenuRootFragment extends BaseOsmAndFragment {
@ -291,10 +293,13 @@ public class ConfigureMenuRootFragment extends BaseOsmAndFragment {
} }
int hiddenCount = ConfigureMenuItemsFragment.getSettingForScreen(app, type).getModeValue(appMode).getHiddenIds().size(); int hiddenCount = ConfigureMenuItemsFragment.getSettingForScreen(app, type).getModeValue(appMode).getHiddenIds().size();
List<ContextMenuItem> allItems = ConfigureMenuItemsFragment.getCustomizableDefaultItems(contextMenuAdapter.getDefaultItems()); List<ContextMenuItem> allItems = ConfigureMenuItemsFragment.getCustomizableDefaultItems(contextMenuAdapter.getDefaultItems());
if (type == ScreenType.DRAWER) { if (type == ScreenType.DRAWER || type == ScreenType.CONFIGURE_MAP) {
Iterator<ContextMenuItem> iterator = allItems.iterator(); Iterator<ContextMenuItem> iterator = allItems.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
if (DRAWER_DIVIDER_ID.equals(iterator.next().getId())) { String id = iterator.next().getId();
if (DRAWER_DIVIDER_ID.equals(id)
|| SHOW_CATEGORY_ID.equals(id)
|| MAP_RENDERING_CATEGORY_ID.equals(id)) {
iterator.remove(); iterator.remove();
} }
} }