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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-11-10 16:42:06 +01:00
commit b47dd40f31
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout-land/map_hud_bottom.xml
View file

@ -265,14 +265,14 @@
<include <include
layout="@layout/move_marker_bottom_sheet" layout="@layout/move_marker_bottom_sheet"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
tools:visibility="visible"/> tools:visibility="visible"/>
<include <include
layout="@layout/add_gpx_point_bottom_sheet" layout="@layout/add_gpx_point_bottom_sheet"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
tools:visibility="visible"/> tools:visibility="visible"/>

3
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -340,6 +340,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
if (removeFragment(PlanRouteFragment.TAG)) { if (removeFragment(PlanRouteFragment.TAG)) {
app.getMapMarkersHelper().getPlanRouteContext().setFragmentVisible(true); app.getMapMarkersHelper().getPlanRouteContext().setFragmentVisible(true);
} }
if (TrackDetailsMenu.isVisible()) {
mapLayers.getMapControlsLayer().getTrackDetailsMenu().hide();
}
removeFragment(ImportGpxBottomSheetDialogFragment.TAG); removeFragment(ImportGpxBottomSheetDialogFragment.TAG);
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
} }

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenuFragment.java
View file

@ -180,7 +180,7 @@ public class TrackDetailsMenuFragment extends BaseOsmAndFragment {
public static boolean showInstance(final MapActivity mapActivity) { public static boolean showInstance(final MapActivity mapActivity) {
try { try {
boolean portrait = mapActivity.findViewById(R.id.bottomFragmentContainer) != null; boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
TrackDetailsMenuFragment fragment = new TrackDetailsMenuFragment(); TrackDetailsMenuFragment fragment = new TrackDetailsMenuFragment();
mapActivity.getSupportFragmentManager().beginTransaction() mapActivity.getSupportFragmentManager().beginTransaction()
.add(portrait ? R.id.bottomFragmentContainer : R.id.routeMenuContainer, fragment, TAG) .add(portrait ? R.id.bottomFragmentContainer : R.id.routeMenuContainer, fragment, TAG)