Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-08-13 09:45:15 +02:00
commit aea5bfc9ea
2 changed files with 3 additions and 2 deletions

View file

@ -78,7 +78,7 @@ public class SplitSegmentFragment extends OsmAndListFragment {
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
updateContent(); updateContent();
updateHeader(); // Obsolete: updateHeader();
} }
@Override @Override
@ -213,6 +213,7 @@ public class SplitSegmentFragment extends OsmAndListFragment {
adapter.add(overviewSegments); adapter.add(overviewSegments);
List<GpxDisplayItem> splitSegments = getSplitSegments(); List<GpxDisplayItem> splitSegments = getSplitSegments();
adapter.addAll(splitSegments); adapter.addAll(splitSegments);
// Obsolete: adapter.setNotifyOnChange(true);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
getListView().setSelection(0); getListView().setSelection(0);
headerView.setTranslationY(0); headerView.setTranslationY(0);

View file

@ -757,7 +757,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
for (GpxDisplayItem i : flatten(groups)) { for (GpxDisplayItem i : flatten(groups)) {
adapter.add(i); adapter.add(i);
} }
adapter.setNotifyOnChange(true); // Obsolete: adapter.setNotifyOnChange(true);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
if (getActivity() != null) { if (getActivity() != null) {
updateHeader(); updateHeader();