Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-11-03 18:33:57 +01:00
commit 7d9c11e8e9

View file

@ -462,6 +462,10 @@ public class MapActivity extends AccessibleActivity implements
// changeLocation = false; // changeLocation = false;
// } // }
final int newZoom = mapView.getZoom() + stp; final int newZoom = mapView.getZoom() + stp;
if (newZoom > 22) {
AccessibleToast.makeText(this, R.string.edit_tilesource_maxzoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
return;
}
mapView.getAnimatedDraggingThread().startZooming(newZoom, changeLocation); mapView.getAnimatedDraggingThread().startZooming(newZoom, changeLocation);
if (app.accessibilityEnabled()) if (app.accessibilityEnabled())
AccessibleToast.makeText(this, getString(R.string.zoomIs) + " " + newZoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$ AccessibleToast.makeText(this, getString(R.string.zoomIs) + " " + newZoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$