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

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

Browse source
This commit is contained in:
Victor Shcherb 2014-12-19 20:12:38 +01:00
commit 3366d9e2e7
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-es/strings.xml
View file

@ -1904,7 +1904,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="rendering_attr_roadStyle_name">Estilo de carretera</string>
<string name="rendering_value_default_name">Por defecto</string>
<string name="rendering_value_orange_name">Naranja</string>
<string name="routing_attr_no_new_routing_name">No usar v1.9 de ruteo</string>
<string name="routing_attr_no_new_routing_name">No usar reglas de ruteo de v1.9</string>
<string name="routing_attr_no_new_routing_description">No usar v1.9 de ruteo</string>
<string name="rendering_value_germanRoadAtlas_name">Atlas de carreteras alemanas</string>
<string name="traffic_warning_railways">Ferrocarriles</string>

6
OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
View file

@ -479,17 +479,13 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
//fixes issue when local files not shown after switching tabs
//temporarily separate this if statement to identify NPE on soma installations
//if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0){
if (listAdapter.getGroupCount() == 0){
if (getDownloadActivity().getLocalIndexInfos().size() > 0){
if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0){
for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()){
listAdapter.addLocalIndexInfo(info);
}
listAdapter.sortData();
getExpandableListView().setAdapter(listAdapter);
}
}
ActionBar actionBar = getDownloadActivity().getSupportActionBar();
//hide action bar from downloadindexfragment
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);