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

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
xmd5a 2015-01-01 14:51:18 +03:00
commit 68efe7ab4f
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values-da/phrases.xml
View file

@ -659,4 +659,5 @@
<string name="poi_attraction_train">Tog (attraktion)</string> <string name="poi_attraction_train">Tog (attraktion)</string>
<string name="poi_water_slide">Vandrutsjebane</string> <string name="poi_water_slide">Vandrutsjebane</string>
<string name="poi_tower">Tårn</string>
</resources> </resources>

1
OsmAnd/res/values-ko/phrases.xml
View file

@ -641,4 +641,5 @@
<string name="poi_attraction_train">기차 (명소)</string> <string name="poi_attraction_train">기차 (명소)</string>
<string name="poi_water_slide">워터 슬라이드</string> <string name="poi_water_slide">워터 슬라이드</string>
<string name="poi_tower">타워</string>
</resources> </resources>

6
OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java
View file

@ -86,6 +86,12 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear
} }
} }
locationUpdate(location); locationUpdate(location);
//This fixes the "all lists are empty when returning to the Dashboard" issue, but should likely be placed more centrally, like in MainMenuActivity?
View view = getView();
if (view != null) {
view.invalidate();
}
} }
@Override @Override

11
OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
View file

@ -2,7 +2,6 @@ package net.osmand.plus.dashboard;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import android.view.View;
/** /**
* Created by Denis on 24.11.2014. * Created by Denis on 24.11.2014.
@ -13,14 +12,4 @@ public class DashBaseFragment extends SherlockFragment {
return (OsmandApplication) getActivity().getApplication(); return (OsmandApplication) getActivity().getApplication();
} }
@Override
public void onResume() {
super.onResume();
//This fixes the "list are empty when returning to the Dashboard" issue
View view = getView();
if (view != null) {
view.invalidate();
}
}
} }

6
OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
View file

@ -69,6 +69,12 @@ public class DashUpdatesFragment extends DashBaseFragment {
cancelButton = null; cancelButton = null;
} }
updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate());
//This fixes the "all lists are empty when returning to the Dashboard" issue, but should likely be placed more centrally, like in MainMenuActivity?
View view = getView();
if (view != null) {
view.invalidate();
}
} }
public void updatedDownloadsList(List<IndexItem> list) { public void updatedDownloadsList(List<IndexItem> list) {