summaryrefslogtreecommitdiff
path: root/navit/android
diff options
context:
space:
mode:
authorJoseph Herlant <herlantj@gmail.com>2018-05-25 22:07:07 -0700
committerJoseph Herlant <aerostitch@users.noreply.github.com>2018-05-25 22:17:50 -0700
commit41a1264cdd43a11695de85eab0bd3c941abf2b70 (patch)
tree3da1ef3bebc674807258ae824ff9156a64adf370 /navit/android
parent8a76acb966f7059caf9d72c853175bd923b1e9d7 (diff)
downloadnavit-41a1264cdd43a11695de85eab0bd3c941abf2b70.tar.gz
cleanup:cmake:remove trailing spaces
Diffstat (limited to 'navit/android')
-rw-r--r--navit/android/AndroidManifest.xml.cmake8
-rw-r--r--navit/android/CMakeLists.txt16
-rw-r--r--navit/android/po2xml.xslt2
-rw-r--r--navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml2
-rw-r--r--navit/android/res/values-v21/styles.xml10
-rw-r--r--navit/android/res/values/strings-dont-translate.xml2
-rw-r--r--navit/android/res/values/strings.xml8
7 files changed, 24 insertions, 24 deletions
diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake
index b5bd757cb..811a895d2 100644
--- a/navit/android/AndroidManifest.xml.cmake
+++ b/navit/android/AndroidManifest.xml.cmake
@@ -28,9 +28,9 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="google.navigation" />
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:scheme="google.navigation" />
</intent-filter>
</activity>
<activity android:name=".NavitAddressSearchActivity"></activity>
@@ -38,4 +38,4 @@
<activity android:name=".NavitAddressResultListActivity"></activity>
<activity android:name=".FileBrowserActivity"></activity>
</application>
-</manifest>
+</manifest>
diff --git a/navit/android/CMakeLists.txt b/navit/android/CMakeLists.txt
index e91c94d7b..6720f4e6d 100644
--- a/navit/android/CMakeLists.txt
+++ b/navit/android/CMakeLists.txt
@@ -51,7 +51,7 @@ if (ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja)
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}
COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/navit/libnavit.so ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}/
COMMAND ${CMAKE_COMMAND}
- -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/navit*.xml"
+ -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/navit*.xml"
-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw
-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
COMMAND ${CMAKE_COMMAND}
@@ -59,28 +59,28 @@ if (ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja)
-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/drawable-nodpi
-D LOWER=1
-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
- COMMAND ${CMAKE_COMMAND}
+ COMMAND ${CMAKE_COMMAND}
-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/lib[b-z]*.so"
-D DST=${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}
-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
- COMMAND ${CMAKE_COMMAND}
- -D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo"
+ COMMAND ${CMAKE_COMMAND}
+ -D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo"
-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw
-D LOWER=1
-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
)
-
+
add_dependencies (android_resources images locales ${NAVIT_LIBNAME})
-
+
add_custom_target ( apkg
COMMAND ant debug
)
-
+
add_custom_target ( apkg-release
COMMAND ant release
)
add_dependencies(apkg android_resources)
add_dependencies(apkg-release android_resources)
-
+
endif(ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja)
diff --git a/navit/android/po2xml.xslt b/navit/android/po2xml.xslt
index 1a92d2db4..17ea440f9 100644
--- a/navit/android/po2xml.xslt
+++ b/navit/android/po2xml.xslt
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:po2xml="http://example.com/namespace" exclude-result-prefixes="po2xml">
-<xsl:param name="po_file"/>
+<xsl:param name="po_file"/>
<xsl:output method="xml" indent="yes" encoding="utf-8"/>
<xsl:function name="po2xml:escape">
diff --git a/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml b/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
index d45485f49..6495317e8 100644
--- a/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
+++ b/navit/android/res/layout/ua_com_vassiliev_filebrowser_layout.xml
@@ -14,7 +14,7 @@
android:layout_gravity="top"
android:background = "#f00"
android:background = "#0f0"
-
+
-->
<LinearLayout
diff --git a/navit/android/res/values-v21/styles.xml b/navit/android/res/values-v21/styles.xml
index a1d66bb3d..3edbb901a 100644
--- a/navit/android/res/values-v21/styles.xml
+++ b/navit/android/res/values-v21/styles.xml
@@ -24,22 +24,22 @@
<style name="NavitTheme" parent="NavitBaseTheme">
<!-- API 21 theme customizations can go here. -->
-
+
<!--
Don't use translucent system bars on API 21 as they are drawn with a semitransparent
black background which can't be changed.
-->
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowTranslucentStatus">false</item>
-
- <!--
+
+ <!--
We could set any semi-transparent color here (or change it in code), but this would not
be available on API 19/20. Simply specifying full transparency allows us to implement a
- separate mechanism that will work on all versions.
+ separate mechanism that will work on all versions.
-->
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">@android:color/transparent</item>
-
+
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
</style>
diff --git a/navit/android/res/values/strings-dont-translate.xml b/navit/android/res/values/strings-dont-translate.xml
index b2a5496bc..f3892ef33 100644
--- a/navit/android/res/values/strings-dont-translate.xml
+++ b/navit/android/res/values/strings-dont-translate.xml
@@ -13,7 +13,7 @@
<!-- OPTIONS MENU -->
<string name="optionsmenu_address_search">@string/address_search_title</string>
-
+
<!-- Backup Restore -->
<string-array name="dialog_backup_restore_items">
<item >@string/backup</item>
diff --git a/navit/android/res/values/strings.xml b/navit/android/res/values/strings.xml
index 87acfec6b..ae80265e3 100644
--- a/navit/android/res/values/strings.xml
+++ b/navit/android/res/values/strings.xml
@@ -25,7 +25,7 @@
<string name="optionsmenu_exit_navit">Exit Navit</string>
<string name="optionsmenu_backup_restore">Backup / Restore</string>
<string name="optionsmenu_set_map_location">Set map location</string>
-
+
<!-- POSITION POP-UP -->
<string name="position_popup_title">Position</string>
<string name="position_popup_drive_here">Route to here</string>
@@ -65,7 +65,7 @@
<string name="address_search_set_destination">Setting destination to:</string>
<string name="address_search_towns">Towns</string>
<string name="address_search_streets">Streets</string>
-
+
<!-- Backup Restore -->
<string name="choose_an_action">Choose an action</string>
<string name="please_insert_an_sd_card">Please insert an SD Card</string>
@@ -82,11 +82,11 @@
<string name="select_backup">Select backup</string>
<string name="backup">Backup</string>
<string name="restore">Restore</string>
-
+
<!-- TTS -->
<string name="TTS_title_data_missing">System text to speech engine data is missing</string>
<string name="TTS_qery_install_data">Navit can use any text to speech engine installed on your device. The currently selected engine reports it is unable to speak in your language. Should we ask the system to show voice download dialog?</string>
-
+
<!-- Permissions dialog-->
<string name="permissions_not_granted">Navit needs permission to access GPS and read the map.\nIf you change your mind please restart Navit and grant the permissions</string>
<string name="permissions_info_box_title">One or more ungranted permissions</string>