Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-07 09:48:23 +02:00
commit 8f15a3cd6a

View file

@ -208,13 +208,13 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
public void onItemSelected(AdapterView<?> parent, View v, int position, long id) { public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
int newFormat = currentFormat; int newFormat = currentFormat;
String itm = (String) format.getItemAtPosition(position); String itm = (String) format.getItemAtPosition(position);
if (PointDescription.formatToHumanString(v.getContext(), PointDescription.FORMAT_DEGREES).equals(itm)) { if (PointDescription.formatToHumanString(NavigatePointFragment.this.getContext(), PointDescription.FORMAT_DEGREES).equals(itm)) {
newFormat = PointDescription.FORMAT_DEGREES; newFormat = PointDescription.FORMAT_DEGREES;
} else if (PointDescription.formatToHumanString(v.getContext(), PointDescription.FORMAT_MINUTES).equals(itm)) { } else if (PointDescription.formatToHumanString(NavigatePointFragment.this.getContext(), PointDescription.FORMAT_MINUTES).equals(itm)) {
newFormat = PointDescription.FORMAT_MINUTES; newFormat = PointDescription.FORMAT_MINUTES;
} else if (PointDescription.formatToHumanString(v.getContext(), PointDescription.FORMAT_SECONDS).equals(itm)) { } else if (PointDescription.formatToHumanString(NavigatePointFragment.this.getContext(), PointDescription.FORMAT_SECONDS).equals(itm)) {
newFormat = PointDescription.FORMAT_SECONDS; newFormat = PointDescription.FORMAT_SECONDS;
} else if (PointDescription.formatToHumanString(v.getContext(), PointDescription.UTM_FORMAT).equals(itm)) { } else if (PointDescription.formatToHumanString(NavigatePointFragment.this.getContext(), PointDescription.UTM_FORMAT).equals(itm)) {
newFormat = PointDescription.UTM_FORMAT; newFormat = PointDescription.UTM_FORMAT;
} }
try { try {