Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove 'test native renderer' activity

Browse source
This commit is contained in:
Alexey Pelykh 2014-11-27 17:31:54 +02:00
parent 616c88b1fb
commit e0ed43da7e
35 changed files with 33 additions and 612 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/AndroidManifest.xml
View file

@ -222,7 +222,6 @@
<activity android:name="net.osmand.plus.development.TestVoiceActivity" />
<activity android:name="net.osmand.plus.download.DownloadActivity" android:label="@string/local_index_descr_title" />
<activity android:name="net.osmand.core.android.GLActivity" android:label="Sample" />
<activity android:name="net.osmand.plus.osmedit.LocalOpenstreetmapActivity" android:label="@string/local_openstreetmap_act_title" />
<!-- keep android:process on a separate line !! -->

12
OsmAnd/res/layout/activity_gl.xml
View file

@ -1,12 +0,0 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="net.osmand.core.samples.android.sample1.GLActivity">
<android.opengl.GLSurfaceView
android:id="@+id/glSurfaceView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>

4
OsmAnd/res/values-be/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="auto_zoom_none">Без аўтаматычнага масштабіраваньня</string>
<string name="auto_zoom_close">Зачыніць</string>
<string name="auto_zoom_far">Для сярэдняга масштаба</string>
@ -1915,7 +1915,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="speed_limit_exceed_message">Задаць дапушчальнае значэньне перавышэньня хуткасьці, пры якім вы атрымаеце галасавое паведамленьне.</string>
<string name="fav_point_emoticons_message">Назва ўлюбёнай кропкі была зьменена на %1$s для магчымасьці захаваньня радка з эматыконам ў файл.</string>
<string name="print_route">Паказаць маршрут</string>
<string name="test_native_render">Тэст натыўнай візуалізацыі</string>
<string name="fav_point_dublicate">Дубляваньне назвы ўлюбёнага пункту</string>
<string name="fav_point_dublicate_message">Назва ўлюбёнага пункту %1$s была зьменена для прадухіленьня дубляваньня імёнаў.</string>
<string name="use_native_render">Выкарыстоўваць натыўную візуалізацыю</string>
@ -1926,7 +1925,6 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="logged_as">Вы ўвайшлі як %1$s</string>
<string name="osmo_no_connection_msg">Сэрвіс OsMo не даступны:\n- Праверце спалучэньне;\n- Праверце налады;\n- Праверце наш Twitter: https://twitter.com/OsMomobi</string>
<string name="anonymous_user_hint">Ананімнаму карыстальніку недаступныя:\n- Вытварэньне груп;\n- Сінхранізацыя груп і прыстасаваньняў з серверам;\n- Кіраваньне групамі і прыстасаваньнямі ў асабістым кабінеце.</string>
<string name="test_native_render_msg">Пачаць працу з натыўнай візуалізацыяй</string>
<string name="configure_map">Настройка мапы</string>
<string name="search_radius_proximity">Паблізу ад</string>
<string name="rendering_category_details">Падрабязнасьці</string>

2
OsmAnd/res/values-bg/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="tip_recent_changes_1_5_t">Промени в 1.5:
\n\t* Гласови предупреждения за пътни ограничения и камери
\n\t* Гласово обявяване имената на улиците

4
OsmAnd/res/values-ca/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
<string name="map_widget_fluorescent">Rutes amb fluorescència</string>
<string name="map_widget_show_ruler">Mostra el regle</string>
@ -1856,8 +1856,6 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
<string name="text_size">Mida del text</string>
<string name="fav_point_dublicate">Nom de punt preferit duplicat</string>
<string name="fav_point_dublicate_message">S\'ha canviat el nom del vostre punt preferit a %1$s per evitar duplicitats.</string>
<string name="test_native_render">Prova de renderització nativa</string>
<string name="test_native_render_msg">Inicia l\'activitat amb renderització nativa</string>
<string name="use_native_render">Utilitza la renderització nativa</string>
<string name="use_native_render_descr">Ús de renderització C++ en comptes de Java</string>
<string name="fav_point_emoticons_message">El nom del vostre punt preferit s\'ha canviat a %1$s per facilitar el desar bé la cadena amb emoticones en un fitxer.</string>

4
OsmAnd/res/values-cs/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
<string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
\n\t- Native rendering pro všechna zařízení
@ -1733,8 +1733,6 @@ s často kladenými otázkami.</string>
<string name="text_size_descr">Nastavit velikost písma na mapě.</string>
<string name="fav_point_dublicate">Název oblíbeného bodu je již použit</string>
<string name="fav_point_dublicate_message">Aby nevznikla duplicita, oblíbený bod byl uložen jako %1$s.</string>
<string name="test_native_render">Test nativního vykreslování</string>
<string name="test_native_render_msg">Spustí činnost s nativním vykreslováním</string>
<string name="use_native_render">Použít nativní vykreslování</string>
<string name="use_native_render_descr">Použít C++ vykreslování místo Javy</string>
<string name="print_route">Vytisknout trasu</string>

4
OsmAnd/res/values-da/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
<string name="av_def_action_video">Optag video</string>
<string name="av_def_action_audio">Optag audio</string>
@ -1805,8 +1805,6 @@
<string name="text_size">Tekststørrelse</string>
<string name="fav_point_dublicate">Favoritnavn dublet</string>
<string name="fav_point_dublicate_message">Favoritnavn er ændret til %1$s for at undgå dubletter.</string>
<string name="test_native_render">Test indbygget optegning</string>
<string name="test_native_render_msg">Start aktivitet med indbygget optegning</string>
<string name="use_native_render">Brug indbygget optegning</string>
<string name="use_native_render_descr">Brug C++ optegning i stedet for Java</string>
<string name="print_route">Udskriv rute</string>

4
OsmAnd/res/values-de/strings.xml
View file

@ -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>
@ -1975,8 +1975,6 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="text_size">Schriftgröße</string>
<string name="fav_point_dublicate">Doppelung beim Favoriten-Namen</string>
<string name="fav_point_dublicate_message">Name des Favoriten bereits vergeben, er wurde auf %1$s geändert.</string>
<string name="test_native_render">Nativen Renderer testen</string>
<string name="test_native_render_msg">Nutzt den nativen Renderer</string>
<string name="use_native_render">Nativen Renderer benutzen</string>
<string name="use_native_render_descr">C++ Renderer statt Java-Renderer nutzen</string>
<string name="fav_point_emoticons_message">Der Name des Favoriten wurde auf %1$s geändert, denn Zeichenketten mit Emoticons können nicht gespeichert werden.</string>

2
OsmAnd/res/values-el/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="btn_add_tag">Προσθήκη Ετικέτας</string>
<string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
<string name="poi_filter_parking">Στάθμευση</string>

4
OsmAnd/res/values-es/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="layer_map_appearance">Configura pantalla</string>
@ -1839,8 +1839,6 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="text_size">Tamaño de texto</string>
<string name="fav_point_dublicate">Nombre de punto favorito duplicado</string>
<string name="fav_point_dublicate_message">Hemos cambiado el nombre de tu punto favorito a %1$s para evitar nombres duplicados.</string>
<string name="test_native_render">Probar renderización nativa</string>
<string name="test_native_render_msg">Iniciar la actividad con renderización nativa</string>
<string name="use_native_render">Usar renderización nativa</string>
<string name="use_native_render_descr">Usar el renderizado C++ en lugar de Java</string>
<string name="print_route">Imprimir ruta</string>

4
OsmAnd/res/values-fr/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
<string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :
@ -1821,8 +1821,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="fav_point_dublicate">Ce nom est déjà utilisé pour un favori.</string>
<string name="fav_point_dublicate_message">Nous avons modifié le nom de votre favori en %1$s pour éviter les doublons.</string>
<string name="text_size_descr">Sélectionnez la taille du texte sur la carte.</string>
<string name="test_native_render">Tester le moteur de rendu natif</string>
<string name="test_native_render_msg">Démarrer l\'activité avec le moteur de rendu natif</string>
<string name="use_native_render">Utiliser le moteur natif de rendu</string>
<string name="use_native_render_descr">Utiliser le moteur de rendu C++ au lieu de Java</string>
<string name="print_route">Exporter l\'itinéraire</string>

4
OsmAnd/res/values-gl/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="fav_point_dublicate_message">O nome do punto favorito foi cambiado a %1$s para evitar os duplicados.</string>
<string name="text_size_descr">Configurar o tamaño da letra no mapa.</string>
<string name="text_size">Tamaño da letra</string>
@ -16,8 +16,6 @@
<string name="tip_search_t">"Pódense buscar sitios directamente no mapa con «Empregar o lugar» → «Buscar preto de aquí» ou chamando pola pantalla de busca mediante «Menú» → «Buscar».\n\nA pantalla de busca fornece modelos para buscar\n\t* polo enderezo\n\t* mediante coordenadas\n\t* como punto de interese (PDI, por tipo ou polo nome)\n\t* mediante o historial de buscas\n\t* ou mediante os favoritos predefinidos.\n\nCon todas as coincidencias hai un menú de contexto ou barra de accións que ofrece opcións tipo «Indicacións a» ou «Mostrar no mapa», etc. "</string>
<string name="fav_point_emoticons_message">Cambiamos o punto favorito a %1$s para facilitar que se garde a cadea con emoticonas nun ficheiro.</string>
<string name="print_route">Imprimir o itinerario</string>
<string name="test_native_render">Probar o renderizador nativo</string>
<string name="test_native_render_msg">Inicia a actividade cun renderizador nativo</string>
<string name="fav_point_dublicate">O nome do punto favorito está duplicado</string>
<string name="use_native_render">Empregar o renderizador nativo</string>
<string name="use_native_render_descr">Empregar o renderizador en C++ en troques de en Java</string>

2
OsmAnd/res/values-hr/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="map_widget_gps_info">GPS informacije</string>
<string name="access_arrival_time">Vrijeme dolaska</string>
<string name="item_checked">provjereno</string>

6
OsmAnd/res/values-hu/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
\n\t- Natív renderelő minden eszközre
\n\t- Offline POI szerkesztés
@ -1767,9 +1767,7 @@
<string name="traffic_warning_calming">Forgalomcsillapító</string>
<string name="traffic_warning_speed_camera">Traffipax</string>
<string name="traffic_warning">Forgalmi figyelmeztetés</string>
<string name="test_native_render">Natív renderelés tesztelése</string>
<string name="test_native_render_msg">Natív renderelő elindítása</string>
<string name="fav_point_dublicate">Kedevenc hely név duplikáció</string>
<string name="fav_point_dublicate">Kedevenc hely név duplikáció</string>
<string name="fav_point_dublicate_message">A duplikáció elkerülése érdekében módosítottuk a kedvenc hely nevét erre: %1$s.</string>
<string name="use_native_render">Natív renderelő használata</string>
<string name="use_native_render_descr">C++ renderelő használata Java helyett</string>

2
OsmAnd/res/values-hy/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="download_hillshade_item">Տարածքի ռելիեֆ</string>
<string name="download_hillshade_maps">Տարածքի մգեցված ռելիեֆով քարտեզներ</string>
<string name="dist_control_start">Սկիզբ</string>

4
OsmAnd/res/values-it/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
<string name="offline_edition">Modifiche offline</string>
@ -1986,8 +1986,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="local_index_description">Clicca su un oggetto per visualizzare maggiori dettagli, tieni premuto per disattivarlo o cancellarlo. Dati attualmente nel dispositivo (%1$s liberi):</string>
<string name="text_size_descr">Imposta la dimensione del testo sulla mappa.</string>
<string name="text_size">Dimensione del testo</string>
<string name="test_native_render">Prova il rendering nativo</string>
<string name="test_native_render_msg">Inizia l\'attività con il rendering nativo</string>
<string name="fav_point_dublicate">Duplicato del nome del punto preferito</string>
<string name="fav_point_dublicate_message">Per evitare duplicati il nome del vostro punto preferito è stato modificato in %1$s.</string>
<string name="use_native_render">Usa il rendering nativo</string>

4
OsmAnd/res/values-ja/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="installing_new_resources">新しいデータを展開中…</string>
<string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
インターネット接続されていません。</string>
@ -2063,8 +2063,6 @@ OsmAndはオープンソースであり、活発に開発が進められいま
<string name="speed_limit_exceed_message">制限速度超過による警告音声の許容値を選択。</string>
<string name="fav_point_emoticons_message">お気に入り地点名%1$sはファイルに絵文字を含む文字列を保存し、分かり易いよう変更されています。</string>
<string name="print_route">経路印刷</string>
<string name="test_native_render">ネイティブレンダリングのテスト</string>
<string name="test_native_render_msg">ネイティブレンダリングを有効化して開始</string>
<string name="fav_point_dublicate">お気に入り地点の重複</string>
<string name="fav_point_dublicate_message">名前の重複を避けるために、%1$s にお気に入り地点の名前を変更しました。</string>
<string name="use_native_render">ネイティブレンダリングを使用</string>

4
OsmAnd/res/values-ko/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
@ -2035,8 +2035,6 @@
<string name="text_size">텍스트 크기</string>
<string name="fav_point_dublicate">즐겨찾기 포인트 이름 중복</string>
<string name="fav_point_dublicate_message">중복된 포인트 이름을 방지 하기 위해서 %1$s 에 즐겨찾기 포인트 이름을 변경합니다.</string>
<string name="test_native_render">기본 렌더링 테스트</string>
<string name="test_native_render_msg">기본 렌더링으로 활동(activity)을 시작합니다</string>
<string name="use_native_render">기본 렌더링 사용</string>
<string name="use_native_render_descr">Java 대신 C++ 렌더링을 사용합니다</string>
<string name="print_route">경로 인쇄</string>

2
OsmAnd/res/values-ku/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="dist_control_start">donya hich wafay bom niya, zhyan hich khoshi bom niya, mrdn jegay shanaziya</string>
<string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string>

4
OsmAnd/res/values-lt/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
<string name="shared_location">Bendrinta vieta</string>
<string name="osmand_parking_warning">Dėmesio</string>
@ -1807,8 +1807,6 @@
<string name="local_index_description">Spustelėkite bet kurį elementą, norėdami gauti daugiau informacijos, paspauskite ir laikykite, norėdami išjungti arba ištrinti. Dabartiniai duomenys įrenginyje (%1$s laisva):</string>
<string name="print_route">Išspausdinti maršrutą</string>
<string name="fav_point_emoticons_message">Mes pakeitėme jūsų įsimintos vietos pavadinimą į %1$s, nes teksto su veidukais išsaugoti faile neįmanoma.</string>
<string name="test_native_render">Testuoti aparatinį atvaizdavimą</string>
<string name="test_native_render_msg">Pradeda veiklą su aparatiniu atvaizdavimu</string>
<string name="use_native_render">Naudoti aparatinį atvaizdavimą</string>
<string name="use_native_render_descr">Naudoti C++ vietoje Java atvaizdavimo</string>
<string name="speed_limit_exceed">Greičio ribojimo viršijimo reikšmė</string>

2
OsmAnd/res/values-lv/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
<string name="select_plugin_to_activate">Atzīmējiet spraudni, lai to aktivizētu (varētu būt nepieciešams OsmAnd restarts)</string>
<string name="prefs_plugins_descr">Spraudņi iespējo aplikācijas papildus funkcijas un uzstādījumus kā piemēram sekošana, enerģijas taupīšana, pieejamība un daudzas citas</string>

2
OsmAnd/res/values-nb/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
<string name="rendering_attr_roadColors_name">Veifargeskjema</string>
<string name="map_widget_show_destination_arrow">Vis retning til målet</string>

4
OsmAnd/res/values-nl/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="layer_map_appearance">Configureer scherm</string>
@ -1969,8 +1969,6 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="text_size">Tekstgrootte</string>
<string name="fav_point_dublicate_message">Favoriet bestaat al: de naam is veranderd in %1$s</string>
<string name="fav_point_dublicate">Favoriet met deze naam bestaat al</string>
<string name="test_native_render">Test \"native weergave\"</string>
<string name="test_native_render_msg">Start activiteit met oorspronkelijke weergave</string>
<string name="use_native_render">Gebruik oorspronkelijke weergave</string>
<string name="use_native_render_descr">Gebruik C++ weergave in plaats van Java</string>
<string name="fav_point_emoticons_message">Favoriet bewaard als %1s omdat vreemde tekens niet opgeslagen kunnen worden in een bestand.</string>

4
OsmAnd/res/values-pl/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
<string name="use_transparent_map_theme">Przezroczysty styl</string>
@ -1910,8 +1910,6 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="text_size">Rozmiar tekstu</string>
<string name="fav_point_dublicate">Zduplikowana nazwa ulubionego punktu</string>
<string name="fav_point_dublicate_message">Zmieniliśmy nazwa twojego ulubionego punktu na %1$s w celu uniknięcia duplikatów nazw.</string>
<string name="test_native_render">Test renderowania natywnego</string>
<string name="test_native_render_msg">Rozpocznij aktywność z renderowaniem natywnym</string>
<string name="use_native_render">Użyj renderowania natywnego</string>
<string name="use_native_render_descr">Użyj kodu renderowania C++ zamiast Java</string>
<string name="speed_limit_exceed">Tolerancja ograniczenia prędkości</string>

8
OsmAnd/res/values-ru/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="osmo_use_https_descr">Использовать безопасное соединение с сервером</string>
<string name="osmo_use_https">Использовать https</string>
@ -1776,8 +1776,7 @@
<string name="traffic_warning">Ограничение скорости</string>
<string name="speed_limit_exceed_message">Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение.</string>
<string name="speed_limit_exceed">Допустимое значение превышения скорости</string>
<string name="test_native_render">Тест нативной визуализации</string>
<string name="fav_point_emoticons_message">Название избранной точки было изменено на %1$s для возможности сохранения строки со смайликом в файл.</string>
<string name="fav_point_emoticons_message">Название избранной точки было изменено на %1$s для возможности сохранения строки со смайликом в файл.</string>
<string name="print_route">Печать маршрута</string>
<string name="fav_point_dublicate">Дублирование названия избранной точки</string>
<string name="fav_point_dublicate_message">Название избранной точки %1$s было изменено для предотвращения дублирования имен.</string>
@ -1786,8 +1785,7 @@
<string name="text_size_descr">Установите размер текста для карты.</string>
<string name="text_size">Размер текста</string>
<string name="local_index_description">Нажмите на любой элемент списка для просмотра более подробной информации, нажмите и удерживайте, чтобы поместить в архив или удалить. Текущие данные на устройстве (%1$s свободно):</string>
<string name="test_native_render_msg">Запустить activity с нативной визуализацией</string>
<string name="osmo_device_not_found">Устройство не обнаружено</string>
<string name="osmo_device_not_found">Устройство не обнаружено</string>
<string name="anonymous_user">Анонимный пользователь</string>
<string name="osmo_no_connection_msg">Сервис OsMo не доступен:\n- проверьте соединение;\n- проверьте настройки;\n- проверьте наш Twitter: https://twitter.com/OsMomobi</string>
<string name="anonymous_user_hint">Анонимному пользователю недоступно:\n- создание групп;\n- синхронизация групп и устройств с сервером;\n- управление группами и устройствами в личном кабинете.</string>

4
OsmAnd/res/values-sc/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
<string name="voice_pref_title">Boghe</string>
<string name="misc_pref_title">Mistura</string>
@ -1742,8 +1742,6 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="text_size">Mannària de su testu</string>
<string name="fav_point_dublicate_message">Amus cambiau su nùmene de su prefèrridu tuo a %1$s pro evitare nùmenes dòpios.</string>
<string name="fav_point_dublicate">Nùmene dòpiu in sos prefèrridos</string>
<string name="test_native_render">Collàuda sa renderizatzione nativa</string>
<string name="test_native_render_msg">Incumentza s\'atividade cun sa renderizatzione nativa</string>
<string name="use_native_render">Imprea sa renderizatzione nativa</string>
<string name="use_native_render_descr">Imprea sa renderizatzione C++ imbetzes de Java</string>
<string name="print_route">Imprenta àndala</string>

4
OsmAnd/res/values-sk/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="recording_context_menu_show">Zobraziť</string>
<string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
<string name="av_def_action_picture">Zachytiť fotografiu</string>
@ -1952,8 +1952,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="text_size">Veľkosť textu</string>
<string name="fav_point_dublicate">Duplicitný názov obľúbeného bodu</string>
<string name="fav_point_dublicate_message">Názov obľúbeného bodu bol zmenený na %1$s, aby nevznikla duplicita.</string>
<string name="test_native_render">Testovať natívne vykresľovanie</string>
<string name="test_native_render_msg">Spustí činnosť s natívnym vykresľovaním</string>
<string name="use_native_render">Použiť natívne vykresľovanie</string>
<string name="use_native_render_descr">Použiť vykresľovanie v C++ namiesto Javy</string>
<string name="fav_point_emoticons_message">Názov obľúbeného bodu bol upravený na %1$s, aby bolo možné správne uložiť názov s emotikonom do súboru.</string>

4
OsmAnd/res/values-sl/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="search_button">Iskanje</string>
<string name="search_activity">Iskanje</string>
<string name="settings_Button">Nastavitve</string>
@ -1965,10 +1965,8 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
<string name="speed_limit_exceed">Toleranca omejitve hitrosti</string>
<string name="speed_limit_exceed_message">Izberite mejo tolerance omejitve hitrosti, nad katero boste prejeli glasovno opozorilo.</string>
<string name="print_route">Tiskanje poti</string>
<string name="test_native_render">Poskus izvirnega upodabljanja</string>
<string name="use_native_render_descr">Uporabi C++ upodabljanje namesto Java</string>
<string name="tip_recent_changes_1_9_t">"Spremembe v 1.9:\n\t* Posodobljeni stili zemljevida s upodabljanjem površine cestišča, transportnih plasti in pohodniških simbolov\n\t* Iskanje POI na poti\n\t* Označi cesto kot neprehodno na sejo\n\t* Lažje nalaganje in posodabljanje zemljevidov\n\t* Vizualno in zvočno obvestilo, ki se izvede ko se približujete točkam\n\t* Tisk poti in informacij o zavojih\n\t* Podpora pasov za zavijanje\n\t* Podpora Android Wear\n\t* Veliko sprememb grafičnega vmesnika\n\t* Ločena povečava za velikost črk na zemljevidu\n\t* Posebna zvočna obvestila v primeru, da niste na poti\n\t* Funkcionalnost prijave v OsMo\n\t* Popravilo OsMo nezdružljivosti različic "</string>
<string name="test_native_render_msg">Začetek aktivnosti z izvirnim upodabljanjem</string>
<string name="fav_point_dublicate">Podvojeno ime priljubljene lokacije</string>
<string name="fav_point_dublicate_message">Ime vaše priljubljene lokacije je bilo spremenjeno v %1$s, da bi se izognili podvojenih imen.</string>
<string name="use_native_render">Uporabi izvirno upodabljanje</string>

4
OsmAnd/res/values-sv/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
<string name="ChooseCountry">Välj land</string>
<string name="choose_city">Välj stad</string>
@ -1690,8 +1690,6 @@
<string name="local_index_description">Peta på en post för att se fler detaljer, tryck och håll för att inaktivera eller ta bort. Data på enheten (%1$s ledigt):</string>
<string name="text_size_descr">Ange textstorlek på kartan.</string>
<string name="text_size">Textstorlek</string>
<string name="test_native_render">Testa inbyggd rendering</string>
<string name="test_native_render_msg">Startar aktivitet med inbyggd rendering</string>
<string name="fav_point_dublicate">Duplicerat namn på favoritpunkt</string>
<string name="fav_point_dublicate_message">Namnet på din favoritpunkt %1$s ändrades för att undvika duplicerade namn.</string>
<string name="use_native_render">Använd inbyggd rendering</string>

2
OsmAnd/res/values-tr/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="close_changeset">Değişiklik listesini kapat</string>
<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz?</string>
<string name="rendering_attr_roadColors_description">Yol renk şemasını seç:</string>

2
OsmAnd/res/values-vi/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Language: Vietnamese; Language code: vi
Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
<resources>

4
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version="1.0" encoding="utf-8"?>
<resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
<string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@ -1816,8 +1816,6 @@
<string name="text_size">文字大小</string>
<string name="fav_point_dublicate">我的最愛標點，名稱重複</string>
<string name="fav_point_dublicate_message">我們把我的最愛標點名稱，改為 %1$s 以避免名稱重複。</string>
<string name="test_native_render">測試原生繪製</string>
<string name="test_native_render_msg">開始啟動原生繪製</string>
<string name="use_native_render">使用原生繪製</string>
<string name="use_native_render_descr">使用 C++ 替代 JAVA 繪製</string>
<string name="print_route">列印路線</string>

2
OsmAnd/res/values/strings.xml
View file

@ -63,8 +63,6 @@
<string name ="speed_limit_exceed_message">Select speed limit tolerance margin, above which you will receive a voice warning.</string>
<string name="fav_point_emoticons_message">The favorite point name has been modified to %1$s to facilitate properly saving the string with emoticons to a file.</string>
<string name="print_route">Print route</string>
<string name="test_native_render">Test native rendering</string>
<string name="test_native_render_msg">Starts activity with native rendering</string>
<string name="fav_point_dublicate">Favorite point name duplicate</string>
<string name="fav_point_dublicate_message">We changed your favorite point name to %1$s to avoid duplicated names.</string>
<string name="use_native_render">Use native rendering</string>

508
OsmAnd/src/net/osmand/core/android/GLActivity.java
View file

@ -1,508 +0,0 @@
package net.osmand.core.android;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext;
import javax.microedition.khronos.egl.EGLDisplay;
import javax.microedition.khronos.egl.EGLSurface;
import javax.microedition.khronos.opengles.GL10;
import net.osmand.core.jni.*;
import net.osmand.data.LatLon;
import net.osmand.data.QuadPoint;
import net.osmand.data.RotatedTileBox;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.helpers.TwoFingerTapDetector;
import net.osmand.plus.render.NativeOsmandLibrary;
import android.app.Activity;
import android.content.Context;
import android.opengl.EGL14;
import android.opengl.GLSurfaceView;
import android.os.Bundle;
import android.os.Environment;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.GestureDetector;
import android.view.GestureDetector.OnDoubleTapListener;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.Window;
import android.view.WindowManager;
import java.io.File;
public class GLActivity extends Activity {
static {
NativeOsmandLibrary.loadLibrary("gnustl_shared");
NativeOsmandLibrary.loadLibrary("Qt5Core");
NativeOsmandLibrary.loadLibrary("Qt5Network");
NativeOsmandLibrary.loadLibrary("Qt5Sql");
NativeOsmandLibrary.loadLibrary("OsmAndCoreWithJNI");
}
private static final String TAG = "OsmAndCoreSample";
private CoreResourcesFromAndroidAssetsCustom _coreResources;
private float _displayDensityFactor;
private int _referenceTileSize;
private int _rasterTileSize;
private IMapStylesCollection _mapStylesCollection;
private ResolvedMapStyle _mapStyle;
private ObfsCollection _obfsCollection;
private MapPresentationEnvironment _mapPresentationEnvironment;
private MapPrimitiviser _mapPrimitiviser;
private ObfMapObjectsProvider _obfMapObjectsProvider;
private MapPrimitivesProvider _mapPrimitivesProvider;
private MapObjectsSymbolsProvider _mapObjectsSymbolsProvider;
private MapRasterLayerProvider _mapRasterLayerProvider;
private OnlineRasterMapLayerProvider _onlineMapRasterLayerProvider;
private IMapRenderer _mapRenderer;
private GpuWorkerThreadPrologue _gpuWorkerThreadPrologue;
private GpuWorkerThreadEpilogue _gpuWorkerThreadEpilogue;
private RenderRequestCallback _renderRequestCallback;
private QIODeviceLogSink _fileLogSink;
private RotatedTileBox currentViewport = null;
private GestureDetector gestureDetector;
protected OsmandApplication getApp() {
return (OsmandApplication) getApplication();
}
private boolean afterTwoFingerTap = false;
TwoFingerTapDetector twoFingerTapDetector = new TwoFingerTapDetector() {
@Override
public void onTwoFingerTap() {
afterTwoFingerTap = true;
currentViewport.setZoom(currentViewport.getZoom() - 1);
updateView();
}
};
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
OsmandSettings st = getApp().getSettings();
WindowManager mgr = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics dm = new DisplayMetrics();
mgr.getDefaultDisplay().getMetrics(dm);
currentViewport = new RotatedTileBox.RotatedTileBoxBuilder().
setLocation(st.getLastKnownMapLocation().getLatitude(),
st.getLastKnownMapLocation().getLongitude()).setZoomAndScale(st.getLastKnownMapZoom(), 0).
setPixelDimensions(dm.widthPixels, dm.heightPixels).build();
currentViewport.setDensity(dm.density);
gestureDetector = new GestureDetector(this, new android.view.GestureDetector.OnGestureListener() {
@Override
public boolean onSingleTapUp(MotionEvent e) {
return false;
}
@Override
public void onShowPress(MotionEvent e) {
}
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
final QuadPoint cp = currentViewport.getCenterPixelPoint();
final LatLon latlon = currentViewport.getLatLonFromPixel(cp.x + distanceX, cp.y + distanceY);
currentViewport.setLatLonCenter(latlon.getLatitude(), latlon.getLongitude());
updateView();
return false;
}
@Override
public void onLongPress(MotionEvent e) {
}
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
return false;
}
@Override
public boolean onDown(MotionEvent e) {
return false;
}
});
gestureDetector.setOnDoubleTapListener(new OnDoubleTapListener() {
@Override
public boolean onSingleTapConfirmed(MotionEvent e) {
return false;
}
@Override
public boolean onDoubleTapEvent(MotionEvent e) {
return false;
}
@Override
public boolean onDoubleTap(MotionEvent e) {
currentViewport.setZoom(currentViewport.getZoom() + 1);
updateView();
return true;
}
});
setContentView(R.layout.activity_gl);
// Get device display density factor
DisplayMetrics displayMetrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
_displayDensityFactor = displayMetrics.density;
_referenceTileSize = (int)(256 * _displayDensityFactor);
_rasterTileSize = Integer.highestOneBit(_referenceTileSize - 1) * 2;
Log.i(TAG, "displayDensityFactor = " + _displayDensityFactor);
Log.i(TAG, "referenceTileSize = " + _referenceTileSize);
Log.i(TAG, "rasterTileSize = " + _rasterTileSize);
Log.i(TAG, "Initializing core...");
_coreResources = CoreResourcesFromAndroidAssetsCustom.loadFromCurrentApplication(this);
OsmAndCore.InitializeCore(_coreResources.instantiateProxy());
File directory =getApp().getAppPath("");
_fileLogSink = QIODeviceLogSink.createFileLogSink(directory.getAbsolutePath() + "/osmandcore.log");
Logger.get().addLogSink(_fileLogSink);
Log.i(TAG, "Going to resolve default embedded style...");
_mapStylesCollection = new MapStylesCollection();
_mapStyle = _mapStylesCollection.getResolvedStyleByName("default");
if (_mapStyle == null)
{
Log.e(TAG, "Failed to resolve style 'default'");
System.exit(0);
}
Log.i(TAG, "Going to prepare OBFs collection");
_obfsCollection = new ObfsCollection();
Log.i(TAG, "Will load OBFs from " + directory.getAbsolutePath());
_obfsCollection.addDirectory(directory.getAbsolutePath(), false);
Log.i(TAG, "Going to prepare all resources for renderer");
_mapPresentationEnvironment = new MapPresentationEnvironment(
_mapStyle,
_displayDensityFactor,
"en"); //TODO: here should be current locale
//mapPresentationEnvironment->setSettings(configuration.styleSettings);
_mapPrimitiviser = new MapPrimitiviser(
_mapPresentationEnvironment);
_obfMapObjectsProvider = new ObfMapObjectsProvider(
_obfsCollection);
_mapPrimitivesProvider = new MapPrimitivesProvider(
_obfMapObjectsProvider,
_mapPrimitiviser,
_rasterTileSize);
_mapObjectsSymbolsProvider = new MapObjectsSymbolsProvider(
_mapPrimitivesProvider,
_rasterTileSize);
_mapRasterLayerProvider = new MapRasterLayerProvider_Software(
_mapPrimitivesProvider);
_onlineMapRasterLayerProvider = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
Log.i(TAG, "Going to create renderer");
_mapRenderer = OsmAndCore.createMapRenderer(MapRendererClass.AtlasMapRenderer_OpenGLES2);
if (_mapRenderer == null)
{
Log.e(TAG, "Failed to create map renderer 'AtlasMapRenderer_OpenGLES2'");
System.exit(0);
}
AtlasMapRendererConfiguration atlasRendererConfiguration = AtlasMapRendererConfiguration.Casts.upcastFrom(_mapRenderer.getConfiguration());
atlasRendererConfiguration.setReferenceTileSizeOnScreenInPixels(_referenceTileSize);
_mapRenderer.setConfiguration(AtlasMapRendererConfiguration.Casts.downcastTo_MapRendererConfiguration(atlasRendererConfiguration));
_mapRenderer.addSymbolsProvider(_mapObjectsSymbolsProvider);
updateView();
/*
IMapRasterLayerProvider mapnik = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
if (mapnik == null)
Log.e(TAG, "Failed to create mapnik");
*/
_mapRenderer.setMapLayerProvider(0, _mapRasterLayerProvider);
_glSurfaceView = (GLSurfaceView) findViewById(R.id.glSurfaceView);
//TODO:_glSurfaceView.setPreserveEGLContextOnPause(true);
_glSurfaceView.setEGLContextClientVersion(2);
_glSurfaceView.setEGLContextFactory(new EGLContextFactory());
_glSurfaceView.setRenderer(new Renderer());
_glSurfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
}
protected void updateView() {
_mapRenderer.setAzimuth(0.0f);
_mapRenderer.setElevationAngle(90);
_mapRenderer.setTarget(new PointI(currentViewport.getCenter31X(), currentViewport.getCenter31Y()));
_mapRenderer.setZoom((float)currentViewport.getZoom() + (float)currentViewport.getZoomScale());
}
private GLSurfaceView _glSurfaceView;
@Override
public boolean onTouchEvent(MotionEvent event) {
if (twoFingerTapDetector.onTouchEvent(event)) {
return true;
}
return gestureDetector.onTouchEvent(event);
}
@Override
protected void onPause() {
super.onPause();
_glSurfaceView.onPause();
}
@Override
protected void onResume() {
super.onResume();
_glSurfaceView.onResume();
}
@Override
protected void onDestroy() {
if (_mapStylesCollection != null) {
_mapStylesCollection.delete();
_mapStylesCollection = null;
}
if (_mapStyle != null) {
_mapStyle.delete();
_mapStyle = null;
}
if (_obfsCollection != null) {
_obfsCollection.delete();
_obfsCollection = null;
}
if (_mapPresentationEnvironment != null) {
_mapPresentationEnvironment.delete();
_mapPresentationEnvironment = null;
}
if (_mapPrimitiviser != null) {
_mapPrimitiviser.delete();
_mapPrimitiviser = null;
}
if (_obfMapObjectsProvider != null) {
_obfMapObjectsProvider.delete();
_obfMapObjectsProvider = null;
}
if (_mapPrimitivesProvider != null) {
_mapPrimitivesProvider.delete();
_mapPrimitivesProvider = null;
}
if (_mapObjectsSymbolsProvider != null) {
_mapObjectsSymbolsProvider.delete();
_mapObjectsSymbolsProvider = null;
}
if (_mapRasterLayerProvider != null) {
_mapRasterLayerProvider.delete();
_mapRasterLayerProvider = null;
}
if (_mapRenderer != null) {
_mapRenderer.delete();
_mapRenderer = null;
}
OsmAndCore.ReleaseCore();
super.onDestroy();
}
private class RenderRequestCallback extends MapRendererSetupOptions.IFrameUpdateRequestCallback {
@Override
public void method(IMapRenderer mapRenderer) {
_glSurfaceView.requestRender();
}
}
public class GpuWorkerThreadPrologue extends MapRendererSetupOptions.IGpuWorkerThreadPrologue {
public GpuWorkerThreadPrologue(EGL10 egl, EGLDisplay eglDisplay, EGLContext context, EGLSurface surface) {
_egl = egl;
_eglDisplay = eglDisplay;
_context = context;
_eglSurface = surface;
}
private final EGL10 _egl;
private final EGLDisplay _eglDisplay;
private final EGLContext _context;
private final EGLSurface _eglSurface;
@Override
public void method(IMapRenderer mapRenderer) {
try {
if (!_egl.eglMakeCurrent(_eglDisplay, _eglSurface, _eglSurface, _context))
Log.e(TAG, "Failed to set GPU worker context active: " + _egl.eglGetError());
} catch (Exception e) {
Log.e(TAG, "Failed to set GPU worker context active", e);
}
}
}
private class GpuWorkerThreadEpilogue extends MapRendererSetupOptions.IGpuWorkerThreadEpilogue {
public GpuWorkerThreadEpilogue(EGL10 egl) {
_egl = egl;
}
private final EGL10 _egl;
@Override
public void method(IMapRenderer mapRenderer) {
try {
if (!_egl.eglWaitGL())
Log.e(TAG, "Failed to wait for GPU worker context: " + _egl.eglGetError());
} catch (Exception e) {
Log.e(TAG, "Failed to wait for GPU worker context", e);
}
}
}
private class EGLContextFactory implements GLSurfaceView.EGLContextFactory {
private EGLContext _gpuWorkerContext;
private EGLSurface _gpuWorkerFakeSurface;
public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
final String eglExtensions = egl.eglQueryString(display, EGL10.EGL_EXTENSIONS);
Log.i(TAG, "EGL extensions: " + eglExtensions);
final String eglVersion = egl.eglQueryString(display, EGL10.EGL_VERSION);
Log.i(TAG, "EGL version: " + eglVersion);
Log.i(TAG, "Creating main context...");
final int[] contextAttribList = {
EGL14.EGL_CONTEXT_CLIENT_VERSION, 2,
EGL10.EGL_NONE };
EGLContext mainContext = null;
try {
mainContext = egl.eglCreateContext(display, eglConfig, EGL10.EGL_NO_CONTEXT, contextAttribList);
} catch (Exception e) {
Log.e(TAG, "Failed to create main context", e);
}
if (mainContext == null || mainContext == EGL10.EGL_NO_CONTEXT) {
Log.e(TAG, "Failed to create main context: " + egl.eglGetError());
mainContext = null;
System.exit(0);
}
Log.i(TAG, "Creating GPU worker context...");
try {
_gpuWorkerContext = egl.eglCreateContext(
display,
eglConfig,
mainContext,
contextAttribList);
} catch (Exception e) {
Log.e(TAG, "Failed to create GPU worker context", e);
}
if (_gpuWorkerContext == null || _gpuWorkerContext == EGL10.EGL_NO_CONTEXT)
{
Log.e(TAG, "Failed to create GPU worker context: " + egl.eglGetError());
_gpuWorkerContext = null;
}
if (_gpuWorkerContext != null)
{
Log.i(TAG, "Creating GPU worker fake surface...");
try {
final int[] surfaceAttribList = {
EGL10.EGL_WIDTH, 1,
EGL10.EGL_HEIGHT, 1,
EGL10.EGL_NONE };
_gpuWorkerFakeSurface = egl.eglCreatePbufferSurface(display, eglConfig, surfaceAttribList);
} catch (Exception e) {
Log.e(TAG, "Failed to create GPU worker fake surface", e);
}
if (_gpuWorkerFakeSurface == null || _gpuWorkerFakeSurface == EGL10.EGL_NO_SURFACE)
{
Log.e(TAG, "Failed to create GPU worker fake surface: " + egl.eglGetError());
_gpuWorkerFakeSurface = null;
}
}
MapRendererSetupOptions rendererSetupOptions = new MapRendererSetupOptions();
if (_gpuWorkerContext != null && _gpuWorkerFakeSurface != null) {
rendererSetupOptions.setGpuWorkerThreadEnabled(true);
_gpuWorkerThreadPrologue = new GpuWorkerThreadPrologue(egl, display, _gpuWorkerContext, _gpuWorkerFakeSurface);
rendererSetupOptions.setGpuWorkerThreadPrologue(_gpuWorkerThreadPrologue.getBinding());
_gpuWorkerThreadEpilogue = new GpuWorkerThreadEpilogue(egl);
rendererSetupOptions.setGpuWorkerThreadEpilogue(_gpuWorkerThreadEpilogue.getBinding());
} else {
rendererSetupOptions.setGpuWorkerThreadEnabled(false);
}
_renderRequestCallback = new RenderRequestCallback();
rendererSetupOptions.setFrameUpdateRequestCallback(_renderRequestCallback.getBinding());
_mapRenderer.setup(rendererSetupOptions);
return mainContext;
}
public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
egl.eglDestroyContext(display, context);
if (_gpuWorkerContext != null) {
egl.eglDestroyContext(display, _gpuWorkerContext);
_gpuWorkerContext = null;
}
if (_gpuWorkerFakeSurface != null) {
egl.eglDestroySurface(display, _gpuWorkerFakeSurface);
_gpuWorkerFakeSurface = null;
}
}
}
private class Renderer implements GLSurfaceView.Renderer {
public void onSurfaceCreated(GL10 gl, EGLConfig config) {
Log.i(TAG, "onSurfaceCreated");
if (_mapRenderer.isRenderingInitialized())
_mapRenderer.releaseRendering();
}
public void onSurfaceChanged(GL10 gl, int width, int height) {
Log.i(TAG, "onSurfaceChanged");
_mapRenderer.setViewport(new AreaI(0, 0, height, width));
_mapRenderer.setWindowSize(new PointI(width, height));
if (!_mapRenderer.isRenderingInitialized())
{
if (!_mapRenderer.initializeRendering())
Log.e(TAG, "Failed to initialize rendering");
}
}
public void onDrawFrame(GL10 gl) {
_mapRenderer.update();
if (_mapRenderer.prepareFrame())
_mapRenderer.renderFrame();
gl.glFlush();
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
}
}

14
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -6,7 +6,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import net.osmand.core.android.GLActivity;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.R;
import net.osmand.plus.activities.SettingsBaseActivity;
@ -45,19 +44,6 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
cat.addPreference(createCheckBoxPreference(settings.USE_NATIVE_RENDER, R.string.use_native_render,R.string.use_native_render_descr));
Preference pref = new Preference(this);
pref.setTitle(R.string.test_native_render);
pref.setSummary(R.string.test_native_render_msg);
pref.setKey("test_native_render");
pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
startActivity(new Intent(SettingsDevelopmentActivity.this, GLActivity.class));
return true;
}
});
cat.addPreference(pref);
pref = new Preference(this);
pref.setTitle(R.string.test_voice_prompts);
pref.setSummary(R.string.play_commands_of_currently_selected_voice);
pref.setKey("test_voice_commands");