Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-28 10:54:33 +01:00
commit ab86fa7af2

View file

@ -101,11 +101,11 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
long agpsLastDownloaded = settings.AGPS_DATA_LAST_TIME_DOWNLOADED.get(); long agpsLastDownloaded = settings.AGPS_DATA_LAST_TIME_DOWNLOADED.get();
pref = new Preference(this); pref = new Preference(this);
pref.setTitle(R.string.agps_info); pref.setTitle(R.string.agps_info);
if (agpsLastDownloaded != null) { if (agpsLastDownloaded != 0L) {
SimpleDateFormat prt = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SimpleDateFormat prt = new SimpleDateFormat("yyyy-MM-dd HH:mm");
pref.setSummary(getString(R.string.agps_data_last_downloaded, prt.format(agpsLastDownloaded))); pref.setSummary(getString(R.string.agps_data_last_downloaded, prt.format(agpsLastDownloaded)));
} else { } else {
pref.setSummary(getString(R.string.agps_data_last_downloaded, "null")); pref.setSummary(getString(R.string.agps_data_last_downloaded, "--"));
} }
pref.setSelectable(false); pref.setSelectable(false);
//setEnabled(false) creates bad readability on some devices //setEnabled(false) creates bad readability on some devices