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 10:33:08 +01:00
commit 0a77c76029
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,8 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) {
view = inflater.inflate(R.layout.navigate_point, container, false);
setHasOptionsMenu(true);
location = null;
OsmandApplication app = (OsmandApplication) getActivity().getApplication();
Intent intent = getSherlockActivity().getIntent();
if(intent != null){
@ -165,6 +166,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
@Override
public void onResume() {
super.onResume();
location = null;
OsmandApplication app = (OsmandApplication) getActivity().getApplication();
//Intent intent = getSherlockActivity().getIntent();
//if (intent != null) {

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

@ -40,7 +40,6 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear
public static final String SEARCH_LON = SearchActivity.SEARCH_LON;
private HistoryAdapter historyAdapter;
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
@ -74,6 +73,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear
@Override
public void onResume() {
super.onResume();
location = null;
FragmentActivity activity = getActivity();
Intent intent = activity.getIntent();
if (intent != null) {