Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-04-07 12:21:26 +02:00
commit ed124b62ef
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/list_item_icon_and_menu.xml
View file

@ -51,8 +51,10 @@
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textSize="@dimen/default_desc_text_size"
tools:text="Some subtitle text"/>
tools:text="Some very long subtitle text, that won't fit into one line"/>
<View
android:layout_width="0dp"

2
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -58,7 +58,7 @@ public class GpxSelectionHelper {
File file = new File(selectedGPXFiles.get(0).getGpxFile().path);
return Algorithms.getFileNameWithoutExtension(file);
} else if (selectedGPXFiles.size() == 0) {
return app.getResources().getString(R.string.shared_string_none);
return null;
} else {
return app.getResources().getString(R.string.number_of_gpx_files_selected_pattern,
selectedGPXFiles.size());