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 2014-12-31 11:21:57 +01:00
commit 319d3465b4
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
View file

@ -166,6 +166,8 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
//Hardy: onResume() code is needed so that search origin is properly reflected in tab contents when origin has been changed on one tab, then tab is changed to another one.
location = null; location = null;
OsmandApplication app = (OsmandApplication) getActivity().getApplication(); OsmandApplication app = (OsmandApplication) getActivity().getApplication();
//Intent intent = getSherlockActivity().getIntent(); //Intent intent = getSherlockActivity().getIntent();

2
OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
View file

@ -73,6 +73,8 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
//Hardy: onResume() code is needed so that search origin is properly reflected in tab contents when origin has been changed on one tab, then tab is changed to another one.
location = null; location = null;
FragmentActivity activity = getActivity(); FragmentActivity activity = getActivity();
Intent intent = activity.getIntent(); Intent intent = activity.getIntent();