Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-07-21 18:22:45 +02:00
commit d1cacdb6a6

View file

@ -703,10 +703,11 @@ public class MapActivityActions implements DialogProvider {
} }
final Spinner fromSpinner = ((Spinner) view.findViewById(R.id.FromSpinner)); final Spinner fromSpinner = ((Spinner) view.findViewById(R.id.FromSpinner));
ArrayAdapter<String> fromAdapter = new ArrayAdapter<String>(view.getContext(), ArrayAdapter<String> fromAdapter = new ArrayAdapter<String>(view.getContext(),
android.R.layout.simple_spinner_dropdown_item, android.R.layout.simple_spinner_item,
fromActions fromActions
); );
fromSpinner.setAdapter(fromAdapter); fromSpinner.setAdapter(fromAdapter);
fromSpinner.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
if(style.routeFromMapPoint && mapView != null) { if(style.routeFromMapPoint && mapView != null) {
fromSpinner.setSelection(1); fromSpinner.setSelection(1);
} }
@ -733,9 +734,10 @@ public class MapActivityActions implements DialogProvider {
} }
final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner)); final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner));
ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(view.getContext(), ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(view.getContext(),
android.R.layout.simple_spinner_dropdown_item, android.R.layout.simple_spinner_item,
toActions toActions
); );
toAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
toSpinner.setAdapter(toAdapter); toSpinner.setAdapter(toAdapter);
return toSpinner; return toSpinner;
} }