Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-07-07 01:41:00 +02:00
commit d2c30f3105
3 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ rendering_types.xml
countries.reginfo
h_*.png
g_*.png
mm_*.png

View file

@ -24,9 +24,9 @@
<include name="voice/**"/>
</fileset>
</copy>
<copy todir="res/drawable-mdpi">
<fileset dir="../../resources/rendering_styles/icons-mdpi/" >
<include name="*"/>
<copy todir="res/">
<fileset dir="../../resources/rendering_styles/style-icons/" >
<include name="**/*"/>
</fileset>
</copy>
<copy todir="${use.absolute.dir}/net/osmand/router/">

View file

@ -82,7 +82,7 @@ public class RenderingIcons {
public static void initIcons() {
Class<? extends drawable> cl = R.drawable.class;
for (Field f : cl.getDeclaredFields()) {
if (f.getName().startsWith("h_") || f.getName().startsWith("g_")) {
if (f.getName().startsWith("h_") || f.getName().startsWith("mm_")) {
try {
icons.put(f.getName().substring(2), f.getInt(null));
} catch (IllegalArgumentException e) {