Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-10-16 08:53:44 +02:00
commit 606b1b67f6

View file

@ -533,6 +533,9 @@ public class QuickSearchPoiFilterFragment extends DialogFragment {
if (!Algorithms.isEmpty(categoryIconStr)) {
categoryIconId = RenderingIcons.getBigIconResourceId(categoryIconStr);
}
if (categoryIconId == 0) {
categoryIconId = getResources().getIdentifier("mx_" + category, "drawable", app.getPackageName());
}
if (categoryIconId == 0) {
categoryIconId = R.drawable.ic_action_folder_stroke;
}