Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch
This commit is contained in:
commit
3380abede2
1 changed files with 14 additions and 2 deletions
|
@ -43,8 +43,20 @@ public class MapMarkersDialogFragment extends android.support.v4.app.DialogFragm
|
|||
@Nullable
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
|
||||
List<Fragment> fragments = getChildFragmentManager().getFragments();
|
||||
for (Fragment fragment : fragments) {
|
||||
if (fragment instanceof MapMarkersActiveFragment) {
|
||||
activeFragment = (MapMarkersActiveFragment) fragment;
|
||||
} else if (fragment instanceof MapMarkersHistoryFragment) {
|
||||
historyFragment = (MapMarkersHistoryFragment) fragment;
|
||||
}
|
||||
}
|
||||
if (activeFragment == null) {
|
||||
activeFragment = new MapMarkersActiveFragment();
|
||||
}
|
||||
if (historyFragment == null) {
|
||||
historyFragment = new MapMarkersHistoryFragment();
|
||||
}
|
||||
|
||||
FragmentManager fragmentManager = getChildFragmentManager();
|
||||
Fragment markerOptionsFragment = fragmentManager.findFragmentByTag(MarkerOptionsBottomSheetDialogFragment.TAG);
|
||||
|
|
Loading…
Reference in a new issue