Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-16 01:34:23 +01:00
commit edbde47c35

View file

@ -47,6 +47,7 @@ import android.graphics.Path;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams; import android.widget.LinearLayout.LayoutParams;
@ -751,7 +752,7 @@ public class RouteInfoWidgetsFactory {
int cacheRulerDistPix = (int) (pixDensity * roundedDist); int cacheRulerDistPix = (int) (pixDensity * roundedDist);
cacheRulerText = OsmAndFormatter.getFormattedDistance((float) roundedDist, view.getApplication()); cacheRulerText = OsmAndFormatter.getFormattedDistance((float) roundedDist, view.getApplication());
text.setText(cacheRulerText); text.setText(cacheRulerText);
LinearLayout.LayoutParams lp = (LayoutParams) layout.getLayoutParams(); ViewGroup.LayoutParams lp = layout.getLayoutParams();
lp.width = cacheRulerDistPix; lp.width = cacheRulerDistPix;
layout.setLayoutParams(lp); layout.setLayoutParams(lp);
layout.requestLayout(); layout.requestLayout();