Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-29 17:32:47 +01:00
commit 11585686a3

View file

@ -273,7 +273,7 @@ public class SelectedGPXFragment extends OsmAndListFragment {
final TIntArrayList list = new TIntArrayList(); final TIntArrayList list = new TIntArrayList();
final Spinner colorSpinner = (Spinner) view.findViewById(R.id.ColorSpinner); final Spinner colorSpinner = (Spinner) view.findViewById(R.id.ColorSpinner);
ColorDialogs.setupColorSpinner(getActivity(), getGpx().getColor(0), colorSpinner, list); ColorDialogs.setupColorSpinner(getActivity(), getGpx().getColor(getColor(0)), colorSpinner, list);
final Spinner sp = (Spinner) view.findViewById(R.id.Spinner); final Spinner sp = (Spinner) view.findViewById(R.id.Spinner);
AlertDialog.Builder bld = new AlertDialog.Builder(getMyActivity()); AlertDialog.Builder bld = new AlertDialog.Builder(getMyActivity());