Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5d810c3f57
2 changed files with 1 additions and 4 deletions
|
@ -253,6 +253,7 @@ public class WorldRegion {
|
||||||
}
|
}
|
||||||
|
|
||||||
public LatLon getCenter() {
|
public LatLon getCenter() {
|
||||||
|
// TODO
|
||||||
return center;
|
return center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,6 @@ public class ItemViewHolder {
|
||||||
protected final ImageView rightImageButton;
|
protected final ImageView rightImageButton;
|
||||||
protected final Button rightButton;
|
protected final Button rightButton;
|
||||||
protected final ProgressBar progressBar;
|
protected final ProgressBar progressBar;
|
||||||
private final OsmandSettings.CommonPreference<Boolean> isFirstMapDownloadedPreference;
|
|
||||||
|
|
||||||
private boolean srtmDisabled;
|
private boolean srtmDisabled;
|
||||||
private boolean srtmNeedsInstallation;
|
private boolean srtmNeedsInstallation;
|
||||||
|
@ -94,9 +93,6 @@ public class ItemViewHolder {
|
||||||
textColorPrimary = typedValue.data;
|
textColorPrimary = typedValue.data;
|
||||||
theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
|
theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
|
||||||
textColorSecondary = typedValue.data;
|
textColorSecondary = typedValue.data;
|
||||||
|
|
||||||
isFirstMapDownloadedPreference = context.getMyApplication().getSettings()
|
|
||||||
.registerBooleanPreference(DownloadActivity.FIRST_MAP_DOWNLOADED, false).makeGlobal();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setShowRemoteDate(boolean showRemoteDate) {
|
public void setShowRemoteDate(boolean showRemoteDate) {
|
||||||
|
|
Loading…
Reference in a new issue