From 7624cd36eced33d55dc43970e9ec4b6b5f5a9d7f Mon Sep 17 00:00:00 2001 From: PavelRatushny Date: Mon, 10 Jul 2017 10:42:31 +0300 Subject: [PATCH] Test displaying last segment --- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 1 + .../src/net/osmand/plus/activities/TrackActivity.java | 10 ++++++++++ .../net/osmand/plus/myplaces/TrackSegmentFragment.java | 1 + 3 files changed, 12 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index e0553c7f50..ad8931db29 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -521,6 +521,7 @@ public class GPXUtilities { if (speed > 0) { totalSpeedSum += speed; +// android.util.Log.d(GPXUtilities.class.getSimpleName(), "metricEnd: " + s.metricEnd + " speed: " + speed); minSpeed = Math.min(speed, minSpeed); maxSpeed = Math.max(speed, maxSpeed); speedCount++; diff --git a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java index 86cbbc353e..6cd2b107a5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/TrackActivity.java @@ -48,6 +48,10 @@ public class TrackActivity extends TabActivity { private List originalGroups = new ArrayList<>(); private boolean stopped = false; + public PagerSlidingTabStrip getSlidingTabLayout() { + return slidingTabLayout; + } + @Override public void onCreate(Bundle icicle) { ((OsmandApplication) getApplication()).applyTheme(this); @@ -234,6 +238,9 @@ public class TrackActivity extends TabActivity { ((TrackSegmentFragment) frag).updateSplitView(); } } + if (isHavingWayPoints() || isHavingRoutePoints()) { + getSlidingTabLayout().setVisibility(View.VISIBLE); + } getSupportFragmentManager().popBackStack(); return true; } @@ -264,6 +271,9 @@ public class TrackActivity extends TabActivity { ((TrackSegmentFragment) frag).updateSplitView(); } } + if (isHavingWayPoints() || isHavingRoutePoints()) { + getSlidingTabLayout().setVisibility(View.VISIBLE); + } getSupportFragmentManager().popBackStack(); return; } diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index 0ddbe9373f..e3f8fdb18d 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -1472,6 +1472,7 @@ public class TrackSegmentFragment extends OsmAndListFragment { } void openSplitIntervalScreen() { + getMyActivity().getSlidingTabLayout().setVisibility(View.GONE); getMyActivity().getSupportFragmentManager() .beginTransaction() .replace(R.id.track_activity_layout, new SplitSegmentFragment())