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:
GaidamakUA 2015-10-26 11:28:47 +02:00
commit 0063091275
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
View file

@ -60,14 +60,6 @@ public class LocalIndexHelper {
} else { } else {
info.setDescription(getInstalledDate(f)); info.setDescription(getInstalledDate(f));
} }
} else if(info.getType() == LocalIndexType.WIKI_DATA){
info.setDescription(getInstalledDate(f));
} else if(info.getType() == LocalIndexType.SRTM_DATA){
info.setDescription(app.getString(R.string.download_srtm_maps));
} else if(info.getType() == LocalIndexType.VOICE_DATA){
info.setDescription(getInstalledDate(f));
} else if(info.getType() == LocalIndexType.TTS_VOICE_DATA){
info.setDescription(getInstalledDate(f));
} else if(info.getType() == LocalIndexType.TILES_DATA){ } else if(info.getType() == LocalIndexType.TILES_DATA){
ITileSource template ; ITileSource template ;
if(f.isDirectory() && TileSourceManager.isTileSourceMetaInfoExist(f)){ if(f.isDirectory() && TileSourceManager.isTileSourceMetaInfoExist(f)){
@ -83,6 +75,14 @@ public class LocalIndexHelper {
descr += "\n" + app.getString(R.string.local_index_tile_data_expire, template.getExpirationTimeMinutes()); descr += "\n" + app.getString(R.string.local_index_tile_data_expire, template.getExpirationTimeMinutes());
} }
info.setDescription(descr); info.setDescription(descr);
} else if(info.getType() == LocalIndexType.SRTM_DATA){
info.setDescription(app.getString(R.string.download_srtm_maps));
} else if(info.getType() == LocalIndexType.WIKI_DATA){
info.setDescription(getInstalledDate(f));
} else if(info.getType() == LocalIndexType.TTS_VOICE_DATA){
info.setDescription(getInstalledDate(f));
} else if(info.getType() == LocalIndexType.VOICE_DATA){
info.setDescription(getInstalledDate(f));
} }
} }
@ -97,8 +97,8 @@ public class LocalIndexHelper {
loadTilesData(app.getAppPath(IndexConstants.TILES_INDEX_DIR), result, false, loadTask); loadTilesData(app.getAppPath(IndexConstants.TILES_INDEX_DIR), result, false, loadTask);
loadSrtmData(app.getAppPath(IndexConstants.SRTM_INDEX_DIR), result, loadTask); loadSrtmData(app.getAppPath(IndexConstants.SRTM_INDEX_DIR), result, loadTask);
loadWikiData(app.getAppPath(IndexConstants.WIKI_INDEX_DIR), result, loadTask); loadWikiData(app.getAppPath(IndexConstants.WIKI_INDEX_DIR), result, loadTask);
loadVoiceData(app.getAppPath(IndexConstants.VOICE_INDEX_DIR), result, false, loadTask);
loadVoiceData(app.getAppPath(IndexConstants.TTSVOICE_INDEX_EXT_ZIP), result, true, loadTask); loadVoiceData(app.getAppPath(IndexConstants.TTSVOICE_INDEX_EXT_ZIP), result, true, loadTask);
loadVoiceData(app.getAppPath(IndexConstants.VOICE_INDEX_DIR), result, false, loadTask);
return result; return result;
} }
@ -211,8 +211,8 @@ public class LocalIndexHelper {
TILES_DATA(R.string.local_indexes_cat_tile), TILES_DATA(R.string.local_indexes_cat_tile),
SRTM_DATA(R.string.local_indexes_cat_srtm, R.drawable.ic_plugin_srtm), SRTM_DATA(R.string.local_indexes_cat_srtm, R.drawable.ic_plugin_srtm),
WIKI_DATA(R.string.local_indexes_cat_wiki, R.drawable.ic_plugin_wikipedia), WIKI_DATA(R.string.local_indexes_cat_wiki, R.drawable.ic_plugin_wikipedia),
VOICE_DATA(R.string.local_indexes_cat_voice, R.drawable.ic_action_volume_up),
TTS_VOICE_DATA(R.string.local_indexes_cat_tts, R.drawable.ic_action_volume_up); TTS_VOICE_DATA(R.string.local_indexes_cat_tts, R.drawable.ic_action_volume_up);
VOICE_DATA(R.string.local_indexes_cat_voice, R.drawable.ic_action_volume_up),
// AV_DATA(R.string.local_indexes_cat_av);; // AV_DATA(R.string.local_indexes_cat_av);;
@StringRes @StringRes
@ -237,7 +237,4 @@ public class LocalIndexHelper {
} }
} }
} }