diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-12-23 00:07:54 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-12-23 00:07:54 +0000 |
| commit | 72610e10606966e678dc402f5847e0cf86d16a38 (patch) | |
| tree | a85729244bd5cb6f317ca9b3be99c2c69ade4a2a /navit | |
| parent | ce807cab418768f27e6ab678de3d4d4885b4834b (diff) | |
| download | navit-svn-72610e10606966e678dc402f5847e0cf86d16a38.tar.gz | |
Add:port_android:Support xhdpi, xxhdpi, xxxhdpi display densities. Related to #1181.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5983 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | navit/xslt/android.xslt | 27 |
2 files changed, 31 insertions, 1 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 3bf11fa3..b3bfb1f2 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -139,10 +139,13 @@ macro(process_xslt SRC_XML DEST_XML) endmacro() if(ANDROID) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitxxxhdpi.xml OSD_SIZE=5.33 ICON_SMALL=96 ICON_MEDIUM=128 ICON_BIG=128) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitxxhdpi.xml OSD_SIZE=4 ICON_SMALL=64 ICON_MEDIUM=96 ICON_BIG=96) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitxhdpi.xml OSD_SIZE=2.67 ICON_MEDIUM=64) process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navithdpi.xml OSD_SIZE=2 ICON_MEDIUM=48) process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitmdpi.xml OSD_SIZE=1.33) process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitldpi.xml OSD_SIZE=1) - add_custom_target( navit_config_xml ALL DEPENDS navithdpi.xml navitmdpi.xml navitldpi.xml) + add_custom_target( navit_config_xml ALL DEPENDS navitxxxhdpi.xml navitxxhdpi.xml navitxhdpi.xml navithdpi.xml navitmdpi.xml navitldpi.xml) else() process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navit.xml "") add_custom_target( navit_config_xml_resource DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/navit.xml COMMAND mkdir -p resources/share/navit COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/navit.xml resources/share/navit) diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt index 482a832b..6588421b 100644 --- a/navit/xslt/android.xslt +++ b/navit/xslt/android.xslt @@ -64,6 +64,33 @@ <xsl:apply-templates/> </xsl:copy> </xsl:template> + <xsl:template match="/config/navit/layout/layer/itemgra/child::*"> + <xsl:copy> + <xsl:copy-of select="@*[not(name()='text_size') and not(name()='width') and not(name()='radius') and not(name()='w') and not(name()='h') and not(name()='x') and not(name()='y')]"/> + <xsl:if test="@text_size"> + <xsl:attribute name="text_size"><xsl:value-of select="round(number(@text_size)*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + <xsl:if test="@width"> + <xsl:attribute name="width"><xsl:value-of select="round(number(@width)*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + <xsl:if test="@radius"> + <xsl:attribute name="radius"><xsl:value-of select="round(number(@radius)*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + <xsl:if test="@w"> + <xsl:attribute name="w"><xsl:value-of select="round(number(@w)*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + <xsl:if test="@h"> + <xsl:attribute name="h"><xsl:value-of select="round(number(@h)*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + <xsl:apply-templates/> + <xsl:if test="@x"> + <xsl:attribute name="x"><xsl:value-of select="round(number(@x)*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + <xsl:if test="@y"> + <xsl:attribute name="y"><xsl:value-of select="round(number(@y)*number($OSD_SIZE))"/></xsl:attribute> + </xsl:if> + </xsl:copy> + </xsl:template> <xsl:template match="/config/navit/layout[@name='Car-Android']"> <xsl:copy> <xsl:copy-of select="@*"/> |