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 2015-03-28 10:47:47 +01:00
commit 79a7f818f5
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -98,15 +98,14 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
//pref.setEnabled(false);
cat.addPreference(pref);
long agpsLastDonwloaded = settings.AGPS_DATA_LAST_TIME_DOWNLOADED.get();
long agpsLastDownloaded = settings.AGPS_DATA_LAST_TIME_DOWNLOADED.get();
pref = new Preference(this);
pref.setTitle(R.string.agps_info);
if (agpsLastDonwloaded != null) {
if (agpsLastDownloaded != null) {
SimpleDateFormat prt = new SimpleDateFormat("yyyy-MM-dd HH:mm");
pref.setSummary(getString(R.string.agps_data_last_downloaded, prt.format(agpsLastDonwloaded)));
pref.setSummary(getString(R.string.agps_data_last_downloaded, prt.format(agpsLastDownloaded)));
} else {
pref.setSummary(getString(R.string.agps_data_last_downloaded, "null",
"null"));
pref.setSummary(getString(R.string.agps_data_last_downloaded, "null"));
}
pref.setSelectable(false);
//setEnabled(false) creates bad readability on some devices
@ -121,7 +120,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
pref.setSummary(getString(R.string.day_night_info_description, prt.format(sunriseSunset.getSunrise()),
prt.format(sunriseSunset.getSunset())));
} else {
pref.setSummary(getString(R.string.day_night_info_description, "null"));
pref.setSummary(getString(R.string.day_night_info_description, "null", "null"));
}
pref.setSelectable(false);
//setEnabled(false) creates bad readability on some devices