diff --git a/data/basic_hdpi.skn b/data/basic_hdpi.skn index 8baf9255a6..d150a953b1 100644 --- a/data/basic_hdpi.skn +++ b/data/basic_hdpi.skn @@ -1,428 +1,428 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/basic_ldpi.skn b/data/basic_ldpi.skn index 3505cabb0c..d5889512a8 100644 --- a/data/basic_ldpi.skn +++ b/data/basic_ldpi.skn @@ -2,427 +2,427 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/basic_mdpi.skn b/data/basic_mdpi.skn index 333d582ef6..0b8bba3754 100644 --- a/data/basic_mdpi.skn +++ b/data/basic_mdpi.skn @@ -1,428 +1,428 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/basic_xhdpi.skn b/data/basic_xhdpi.skn new file mode 100644 index 0000000000..8f8f22974e --- /dev/null +++ b/data/basic_xhdpi.skn @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/symbols_hdpi.png b/data/symbols_hdpi.png index 14e79c2d58..fa4cf2e16d 100644 Binary files a/data/symbols_hdpi.png and b/data/symbols_hdpi.png differ diff --git a/data/symbols_ldpi.png b/data/symbols_ldpi.png index 812f4f3e09..9e97bf4f8a 100644 Binary files a/data/symbols_ldpi.png and b/data/symbols_ldpi.png differ diff --git a/data/symbols_mdpi.png b/data/symbols_mdpi.png index fa4cf2e16d..812f4f3e09 100644 Binary files a/data/symbols_mdpi.png and b/data/symbols_mdpi.png differ diff --git a/data/symbols_xhdpi.png b/data/symbols_xhdpi.png new file mode 100644 index 0000000000..14e79c2d58 Binary files /dev/null and b/data/symbols_xhdpi.png differ diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh index b9e1e810b3..1b783b73d0 100755 --- a/tools/android/update_assets.sh +++ b/tools/android/update_assets.sh @@ -9,10 +9,10 @@ rm $DST/* files=(01_dejavusans.ttf 02_wqy-microhei.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf \ 05_khmeros.ttf 06_code2000.ttf World.mwm WorldCoasts.mwm about-travelguide-iphone.html \ - basic_ldpi.skn basic_mdpi.skn basic_hdpi.skn categories.txt classificator.txt types.txt countries.txt \ - fonts_blacklist.txt fonts_whitelist.txt languages.txt \ - symbols_ldpi.png symbols_mdpi.png symbols_hdpi.png unicode_blocks.txt visibility.txt \ - drules_proto.txt drules_proto.bin) + basic_ldpi.skn basic_mdpi.skn basic_hdpi.skn basic_xhdpi.skn categories.txt classificator.txt + types.txt countries.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt \ + symbols_ldpi.png symbols_mdpi.png symbols_hdpi.png symbols_xhdpi.png unicode_blocks.txt \ + visibility.txt drules_proto.txt drules_proto.bin) for item in ${files[*]} do diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index 02fa872beb..da2ff46566 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -4,16 +4,20 @@ MY_PATH=`dirname $0` BINARY_PATH="$MY_PATH/../../../tools_only-build-release/out/release/skin_generator" DATA_PATH="$MY_PATH/../../data" -"$BINARY_PATH" --symbolWidth 24 --symbolHeight 24 \ +"$BINARY_PATH" --symbolWidth 18 --symbolHeight 18 \ --symbolsDir "$DATA_PATH/styles/symbols" \ --skinName "$DATA_PATH/basic" --skinSuffix="ldpi" -"$BINARY_PATH" --symbolWidth 36 --symbolHeight 36 \ +"$BINARY_PATH" --symbolWidth 24 --symbolHeight 24 \ --symbolsDir "$DATA_PATH/styles/symbols" \ --skinName "$DATA_PATH/basic" --skinSuffix="mdpi" -"$BINARY_PATH" --symbolWidth 48 --symbolHeight 48 \ +"$BINARY_PATH" --symbolWidth 36 --symbolHeight 36 \ --symbolsDir "$DATA_PATH/styles/symbols" \ --skinName "$DATA_PATH/basic" --skinSuffix="hdpi" +"$BINARY_PATH" --symbolWidth 48 --symbolHeight 48 \ + --symbolsDir "$DATA_PATH/styles/symbols" \ + --skinName "$DATA_PATH/basic" --skinSuffix="xhdpi" +