Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-02-03 04:01:29 +01:00
commit b423c668af
7 changed files with 11 additions and 7 deletions

View file

@ -247,6 +247,7 @@
<TextView
android:id="@+id/map_address_text_shadow"
android:importantForAccessibility="no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -310,6 +311,7 @@
<TextView
android:id="@+id/waypoint_text_shadow"
android:importantForAccessibility="no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
@ -496,6 +498,7 @@
<TextView
android:id="@+id/map_lanes_dist_text_shadow"
android:importantForAccessibility="no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

View file

@ -392,7 +392,7 @@
<ImageButton
android:id="@+id/context_menu_more_button"
android:contentDescription="@string/show_point_options"
android:contentDescription="@string/shared_string_more"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"

View file

@ -25,6 +25,7 @@
<TextView
android:id="@+id/map_address_text_shadow"
android:importantForAccessibility="no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -108,6 +109,7 @@
<TextView
android:id="@+id/waypoint_text_shadow"
android:importantForAccessibility="no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
@ -569,6 +571,7 @@
<TextView
android:id="@+id/map_lanes_dist_text_shadow"
android:importantForAccessibility="no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

View file

@ -40,6 +40,7 @@
<ImageView
android:id="@+id/share_my_location"
android:contentDescription="@string/shared_string_share"
android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height"
android:layout_gravity="center_vertical"

View file

@ -190,7 +190,7 @@
<ImageView
android:id="@+id/fab"
android:contentDescription="@string/layer_route"
android:contentDescription="@string/save_filter"
android:layout_width="@dimen/fab_size_with_shadow"
android:layout_height="@dimen/fab_size_with_shadow"
android:layout_gravity="right|bottom"

View file

@ -320,6 +320,7 @@ public class MapActivityLayers {
Button neutralButton = alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
Drawable drawable = app.getIconsCache().getThemedIcon(R.drawable.ic_action_singleselect);
neutralButton.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
neutralButton.setContentDescription(app.getString(R.string.shared_string_filters));
}
});
alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@ -383,6 +384,7 @@ public class MapActivityLayers {
Button neutralButton = alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
Drawable drawable = app.getIconsCache().getThemedIcon(R.drawable.ic_action_multiselect);
neutralButton.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
neutralButton.setContentDescription(app.getString(R.string.apply_filters));
}
});
alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {

View file

@ -640,11 +640,6 @@ public class MapInfoWidgetsFactory {
}
}
if (!text.equals(addressText.getText().toString())) {
if (!text.equals("")) {
topBar.setContentDescription(text);
} else {
topBar.setContentDescription(map.getResources().getString(R.string.map_widget_top_text));
}
addressTextShadow.setText(text);
addressText.setText(text);
return true;