Merge branch 'master' of https://github.com/osmandapp/Osmand into appcompat

2015-01-23 18:45:41 +02:00 · 2015-01-23 18:45:41 +02:00 · d575375cec
commit d575375cec
parent 9392e0418e 161fd18f42
10 changed files with 80 additions and 38 deletions
--- a/OsmAnd/.gitignore
+++ b/OsmAnd/.gitignore
@ -7,6 +7,7 @@ gen/
 local.properties
 raw/
 obj/
+libgnustl/
 cpd.xml
 jni/Local.mk
 out/
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@ -17,11 +17,13 @@ apply plugin: 'com.android.application'
 //                <include name="assets/**/map/fonts/NotoSans/*"/>
 //            </patternset>
 //        </unzip>
+// Less important
 // 2. fix_apostrophe_issues (replace match="[^=]([^\\])'" replace="\1\\\\'") res/**/strings.xml
 // 3. sherpafy/free/paid
 // 4. Release signature
 // 5. APP_NAME, APP_EDITION uses flavor

+
 android {
    compileSdkVersion 21
    buildToolsVersion "21.1.2"
@ -75,12 +77,9 @@ android {
            java.srcDirs = [
                    "src",
                    fileTree(dir: "../OsmAnd-java/src", exclude: "**/PlatformUtil.java")
-              //      "resourcesSrc"
            ]
            resources.srcDirs = [
                    "src"
-             //      "../OsmAnd-java/src"    
-             //       "resourcesSrc"
            ]
            renderscript.srcDirs = ["src"]
            res.srcDirs = [
@ -94,14 +93,15 @@ android {
        free {
            manifest.srcFile "AndroidManifest-free.xml"
        }
-        debug {
+
+        legacy {
            jniLibs.srcDirs = [
-                fileTree(dir: "libs", exclude: "**/libgnustl_shared.so")
+                "libgnustl"
            ]
        }
    }

-    flavorDimensions "version", "abi"
+    flavorDimensions "version", "abi", "coreversion"
    productFlavors {
        // ABI        
        armv7 {
@ -141,12 +141,14 @@ android {
            flavorDimension "version"
            applicationId "net.osmand.plus"
        }
-        /*
-        sherpafy {
-            flavorDimension "version"
-            applicationId "net.osmand.sherpafy"
+
+        legacy {
+            flavorDimension "coreversion"
+        }
+
+        qtcore {
+            flavorDimension "coreversion"
        }
-        */

    }

@ -157,9 +159,6 @@ android {
        nativeDebug {
            signingConfig signingConfigs.development
        }
-        legacyDebug {
-            signingConfig signingConfigs.development
-        }
        release {
            signingConfig signingConfigs.publishing
        }
@ -167,6 +166,7 @@ android {
    }
 }

+
 def replaceNoTranslate(line) {
    if(line.contains("\"app_name\"") && System.getenv("APP_NAME")) {
        return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_NAME")+"<")
@ -285,19 +285,29 @@ task buildOsmAndCore(type: Exec) {
        commandLine "cmd", "/c", "echo", "Not supported"
    }
 }
-task cleanupDuplicatesInCore(type: Delete) {
+
+task cleanupDuplicatesInCore() {
    dependsOn buildOsmAndCore
    // doesn't work for legacy debug builds
-    // delete "libs/armeabi/libgnustl_shared.so"
-    // delete "libs/armeabi-v7a/libgnustl_shared.so"
-    // delete "libs/mips/libgnustl_shared.so"
-    // delete "libs/x86/libgnustl_shared.so"
-
+    doLast {
+        file("libgnustl/armeabi").mkdirs()
+        println file("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so"))
+        file("libgnustl/armeabi-v7a").mkdirs()
+        println file("libs/armeabi-v7a/libgnustl_shared.so").renameTo(file("libgnustl/armeabi-v7a/libgnustl_shared.so"))
+        file("libgnustl/mips").mkdirs()
+        println file("libs/mips/libgnustl_shared.so").renameTo(file("libgnustl/mips/libgnustl_shared.so"))
+        file("libgnustl/x86").mkdirs()
+        println file("libs/x86/libgnustl_shared.so").renameTo(file("libgnustl/x86/libgnustl_shared.so"))
+    }
 }
 tasks.withType(JavaCompile) {
    compileTask -> compileTask.dependsOn << [buildOsmAndCore, downloadAAR, cleanupDuplicatesInCore]
 }

+tasks.withType(JavaCompile) {
+    compileTask -> compileTask.dependsOn << [buildOsmAndCore, downloadAAR]
+}
+
 repositories {
    ivy {
        name = "OsmAndBinariesIvy"
@ -308,12 +318,11 @@ repositories {
    }
 }

-
 dependencies {
    compile fileTree(dir: "libs", include: ["*.jar"], exclude: ["QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar", "android-support*.jar", "OsmAndCore_wrapper.jar"])
    compile 'com.android.support:appcompat-v7:21.0.3'
-    debugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-    legacyDebugCompile fileTree(dir: "libs", include: ["OsmAndCore_wrapper.jar"])
-    nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
-    releaseCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+    qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+    legacyCompile fileTree(dir: "libs", include: ["OsmAndCore_wrapper.jar"])
+    //nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
+    //releaseCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 }
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -1987,7 +1987,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="speak_pedestrian">Папярэджваць пра пешаходныя пераходы</string>
    <string name="rendering_value__name">Па змоўчаньні</string>
 	<string name="save_track_to_gpx_globally_headline">Запіс сьледу па запатрабаваньні</string>
-	<string name="avoid_roads_msg">Вы можаце зьмяніць маршрут пазначыўшы якія дарогі варта пазьбягаць</string>
+	<string name="avoid_roads_msg">Вы можаце зьмяніць маршрут, пазначыўшы дарогі, якія варта пазьбягаць</string>
    <string name="navigation_over_track">Пачаць навігацыю ўздоўж сьледу?</string>
 	<string name="recents">НЯДАЎНІЯ</string>
 	<string name="proxy_pref_title">Проксі</string>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -1885,7 +1885,7 @@
    <string name="proxy_pref_descr">Opsæt en proxy internetkommunikation</string>
    <string name="settings_privacy">Privatliv</string>
    <string name="enable_proxy_title">Aktiver HTTP proxy</string>
-	<string name="enable_proxy_descr">Konfigurer HTTP-proxyserveren for alle netværksanmodninger</string>
+	<string name="enable_proxy_descr">Konfigurer HTTP-proxy for alle netværksanmodninger</string>
 	<string name="proxy_host_title">Proxy vært</string>
 	<string name="proxy_host_descr">Konfigurer proxy værtsnavn (f.eks. 127.0.0.1)</string>
 	<string name="proxy_port_title">Proxy port</string>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
 	<string name="traffic_warning_border_control">Grenzkontrolle</string>
@ -2025,4 +2025,17 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="routing_attr_no_new_routing_name">Routing-Regeln v1.9 nicht verwenden</string>
    <string name="routing_attr_no_new_routing_description">Neuen Routenalgorithmus nicht verwenden</string>
    <string name="speak_pedestrian">Fußgängerübergänge ankündigen</string>
+    <string name="rendering_attr_streetLighting_name">Straßenbeleuchtung</string>
+    <string name="proxy_pref_title">Proxy</string>
+    <string name="settings_privacy">Privatsphäre</string>
+    <string name="rendering_value__name">Standard</string>
+	<string name="enable_proxy_title">HTTP-Proxy aktivieren</string>
+	<string name="enable_proxy_descr">HTTP-Proxy für alle Netzwerkanfragen konfigurieren</string>
+	<string name="proxy_host_title">Proxy-Host</string>
+	<string name="proxy_host_descr">Konfigurieren Sie den Hostnamen ihres Proxys (z.B. 127.0.0.1)</string>
+	<string name="proxy_port_title">Proxy-Port</string>
+	<string name="proxy_port_descr">Konfigurieren Sie die Portnummer Ihres Proxys (z.B. 8118)</string>
+	<string name="proxy_pref_descr">Eine Proxy-Internet-Kommunikation aufsetzen</string>
+    <string name="navigation_over_track">Navigation über Strecke starten?</string>
+	<string name="avoid_roads_msg">Sie können die Route ändern, indem Sie die Straßen auswählen, die vermieden werden sollen</string>
    </resources>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -236,7 +236,7 @@
 	 
 	<string name="choose_auto_follow_route">Auto-sentrer kartvisning</string>
 	<string name="choose_auto_follow_route_descr">Tid til kartvisning synkroniseres med gjeldende posisjon</string>
-	<string name="auto_follow_route_never">Aldri</string>
+	<string name="auto_follow_route_never">Aldri (trykk blå pil for å starte veiledning manuelt)</string>
 	<string name="pref_raster_map">Kartkilde-innstillinger</string>
 	<string name="pref_vector_map">Vektorkart-innstillinger</string>
 	<string name="delete_confirmation_msg">Slette %1$s?</string>
@ -626,7 +626,7 @@
 	<string name="poi_dialog_comment">Kommentar</string>
 	<string name="poi_dialog_comment_default">Interessepunkt endres</string>
 	<string name="default_buttons_commit">Send</string>
-	<string name="default_buttons_reset">Tilbakestill</string>
+	<string name="default_buttons_reset"/>
 	<string name="filter_current_poiButton">Filter</string>
 	<string name="edit_filter_delete_menu_item">Slett</string>
 	<string name="edit_filter_save_as_menu_item">Lagre som</string>
@ -844,7 +844,7 @@
    <string name="targets">Reisemål</string>
    <string name="rendering_attr_hideBuildings_name">Skjul bygninger</string>
    <string name="osmand_parking_warning">Varsel</string>
-	<string name="wake_on_voice_descr">Slå på enhetens skjerm når du nærmer deg en sving</string>
+	<string name="wake_on_voice_descr">Slå på enhetens skjerm (hvis av) når du nærmer deg en sving</string>
    <string name="wake_on_voice_never">Aldri</string>
    <string name="search_radius_proximity">I nærhet av</string>
    <string name="speed_limit_exceed_message">Velg toleransemargin for fartsgrense, overskrides denne vil du få talevarsel.</string>
@ -1037,7 +1037,7 @@
 	<string name="gpx_visibility_txt">Synlighet</string>
 	<string name="gpx_description_txt">Beskrivelse</string>
 	<string name="use_transparent_map_theme">Gjennomsiktig tema</string>
-	<string name="keep_informing_never">Aldri</string>
+	<string name="keep_informing_never">Bare manuelt (trykk pil)</string>
    <string name="local_index_installed">Utgave</string>
 	<string name="local_index_mi_export">Eksporter</string>
 	<string name="gpx_option_destination_point">Bruk gjeldende mål</string>
@ -1191,4 +1191,5 @@
    <string name="show_all">VIS ALLE</string>
 	<string name="speak_pedestrian">Meld om fotgjengeroverganger</string>
    <string name="rendering_value__name">Standard</string>
+	<string name="rendering_attr_streetLighting_name">Gatebelysning</string>
    </resources>
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@ -203,7 +203,7 @@
 	<string name="show_route">Детаљи руте</string>
 	<string name="poi_namefinder_query_empty">Унети упит за претрагу POI</string>
 	<string name="layer_transport_route">Рута транспорта</string>
-	<string name="layer_osm_bugs">OSM bugs (online)</string>
+	<string name="layer_osm_bugs">Дневник грешака ОСМ-а на мрежи</string>
 	<string name="layer_poi">POI…</string>
 	<string name="context_menu_item_search_poi">Претрага POI</string>
 	<string name="where_am_i">Где сам ја?</string>
@ -346,4 +346,14 @@
 	<string name="rendering_value_orange_name">Наранџаста</string>
    <string name="traffic_warning_railways">Пружни прелаз</string>
 	<string name="show_railway_warnings">Приказуј пружне прелазе</string>
+	<string name="rendering_attr_streetLighting_name">Осветљење улице</string>
+    <string name="proxy_pref_title">Мрежни посредник</string>
+    <string name="proxy_pref_descr">Подесите мрежног посредника за интернет</string>
+    <string name="settings_privacy">Приватност</string>
+    <string name="routing_attr_no_new_routing_name">Без усмеравања по издању v1.9</string>
+    <string name="routing_attr_no_new_routing_description">Немој да користиш правила усмеравања из издања v1.9</string>
+    <string name="rendering_attr_transportStops_name">Станице</string>
+    <string name="navigate_point_northing">Географска ширина</string>
+    <string name="navigate_point_easting">Географска дужина</string>
+    <string name="error_avoid_specific_road">Нисам пронашао заобилазнице</string>
    </resources>
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@ -1775,4 +1775,12 @@
 	<string name="proxy_pref_title">Proxy</string>
    <string name="proxy_pref_descr">Ställ in en anslutning till Internet via proxy</string>
    <string name="settings_privacy">Anonymitet</string>
+    <string name="rendering_attr_streetLighting_name">Gatubelysning</string>
+    <string name="enable_proxy_title">Aktivera HTTP-proxy</string>
+	<string name="enable_proxy_descr">Konfigurera HTTP-proxy för alla nätverksbegäran</string>
+	<string name="proxy_host_title">Proxy-värd</string>
+	<string name="proxy_host_descr">Konfigurera ditt proxy-värdnamn (t.ex. 127.0.0.1)</string>
+	<string name="proxy_port_title">Proxy-port</string>
+	<string name="proxy_port_descr">Konfigurera ditt proxy-portnummer (t.ex. 8118)</string>
+	<string name="navigation_over_track">Starta navigering längs spår?</string>
 	</resources>
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@ -19,7 +19,7 @@
    <string name="osm_editing_manage">Manage</string>
    <string name="recents">RECENTS</string>
 	<string name="navigation_over_track">Start navigation over track?</string>
-	<string name="avoid_roads_msg">You can change route by selecting roads to avoid</string>
+	<string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string>
    <string name="rendering_value__name">Default</string>
 	<string name="speak_pedestrian">Announce pedestrian crosswalks</string>
    <string name="rendering_attr_roadStyle_name">Road style</string>
--- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
@ -123,7 +123,7 @@ public class AvoidSpecificRoads {
 				selectFromMap(mapActivity);
 			}
 		});
-		bld.setNegativeButton(R.string.default_buttons_cancel, null);
+		bld.setNegativeButton(R.string.close, null);
 		bld.show();
 	}