Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-11-03 02:06:08 +01:00
commit 0ed22905ce
3 changed files with 15 additions and 3 deletions

View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dip"
android:layout_marginLeft="dip"
android:layout_marginTop="12dip"
android:gravity="center_vertical"
android:textSize="20sp" >
</TextView>

View file

@ -6,7 +6,8 @@
android:layout_height="match_parent"
android:background="@drawable/view_transparent_selection"
android:id="@+id/package_delivered_layout"
android:minHeight="48dp">
android:minHeight="48dp"
android:descendantFocusability="blocksDescendants" >
<ImageView android:id="@+id/waypoint_icon"
android:layout_marginLeft="8dp"
@ -41,6 +42,7 @@
android:contentDescription="@string/more"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:focusable="false"
style="@style/Widget.Sherlock.ActionButton"
android:src="@drawable/ic_action_core_overflow_dark"/>

View file

@ -58,8 +58,7 @@ public class AvoidSpecificRoads {
// User super class to create the View
View v = convertView;
if (position == 0) {
TextView tv = (TextView) ctx.getLayoutInflater().inflate(R.layout.list_textview, null);
tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18);
TextView tv = (TextView) ctx.getLayoutInflater().inflate(R.layout.list_menu_item_native, null);
tv.setText(app.getString(R.string.select_impassable_road));
v = tv;
} else {