Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-10-25 16:34:20 +01:00
commit 5d810c3f57
2 changed files with 1 additions and 4 deletions

View file

@ -253,6 +253,7 @@ public class WorldRegion {
}
public LatLon getCenter() {
// TODO
return center;
}

View file

@ -47,7 +47,6 @@ public class ItemViewHolder {
protected final ImageView rightImageButton;
protected final Button rightButton;
protected final ProgressBar progressBar;
private final OsmandSettings.CommonPreference<Boolean> isFirstMapDownloadedPreference;
private boolean srtmDisabled;
private boolean srtmNeedsInstallation;
@ -94,9 +93,6 @@ public class ItemViewHolder {
textColorPrimary = typedValue.data;
theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
textColorSecondary = typedValue.data;
isFirstMapDownloadedPreference = context.getMyApplication().getSettings()
.registerBooleanPreference(DownloadActivity.FIRST_MAP_DOWNLOADED, false).makeGlobal();
}
public void setShowRemoteDate(boolean showRemoteDate) {