Commit graph

60406 commits

Author SHA1 Message Date
Vitaliy
24103182e7 Fix possible npe
(cherry picked from commit 5c5c1e3af8)
2020-02-26 18:05:32 +02:00
Vitaliy
783b023e75 Fix IllegalStateException
(cherry picked from commit b1624162bf)
2020-02-26 18:05:30 +02:00
Vitaliy
00ef735807 Fix several possible npe
(cherry picked from commit 09f735eec9)
2020-02-26 18:05:28 +02:00
vshcherb
eeeda95f2c
Merge pull request #8569 from osmandapp/minor_fixes
Minor fixes
2020-02-26 17:59:06 +02:00
Vitaliy
5c5c1e3af8 Fix possible npe 2020-02-26 17:08:09 +02:00
Vitaliy
b1624162bf Fix IllegalStateException 2020-02-26 17:05:20 +02:00
Vitaliy
09f735eec9 Fix several possible npe 2020-02-26 17:04:31 +02:00
MadWasp79
628b3167c6 refactoring 2020-02-26 15:50:41 +02:00
MadWasp79
6a56535c9f fix multipolygon center for map and poi 2020-02-26 15:38:27 +02:00
vshcherb
5b2bca4a7d
Merge pull request #8563 from osmandapp/8224_custom_PT_fix
fix custom routing for PT #8224
2020-02-26 11:37:00 +01:00
Victor Shcherb
3d8110c696 Merge strings from 3.6 2020-02-26 12:34:42 +02:00
Vitaliy
5a6540b10b Merge branch 'master' into restore_custom_modes
# Conflicts:
#	OsmAnd/src/net/osmand/plus/SettingsHelper.java
2020-02-26 11:06:50 +02:00
Vitaliy
f6e533d66e Add restore for custom profiles 2020-02-26 10:47:25 +02:00
max-klaus
a16276ab9c Merge branch 'r3.6' 2020-02-25 19:50:06 +03:00
max-klaus
c3cbbe799a
Merge pull request #8558 from osmandapp/avoid_roads_export_import
import fix
2020-02-25 19:42:19 +03:00
Vitaliy
9d857a9f98 Ui fixes 2020-02-25 18:34:26 +02:00
MadWasp79
9790a408c6 fix custom routing for PT #8224 2020-02-25 18:30:39 +02:00
veliymolfar
0eecb08a4a refactor, fix null items list 2020-02-25 18:19:25 +02:00
veliymolfar
1d98082fac import fix 2020-02-25 16:56:16 +02:00
Dmitry
e6613ddb12 Added favorites icons backgrounds for high zoom levels 2020-02-25 16:51:17 +02:00
vshcherb
a5873ada7c
Merge pull request #8554 from osmandapp/enable_speed_setting
add speed setting to brouter and direct to
2020-02-25 15:13:55 +01:00
vshcherb
9cc1611b59
Update VehicleParametersFragment.java 2020-02-25 16:13:43 +02:00
Vitaliy
90651bd290 Remove unnecessary changes
(cherry picked from commit 8194d599c5)
2020-02-25 15:11:09 +02:00
Vitaliy
e8541e7103 Fix dateFormat for different threads
(cherry picked from commit a60584d0d4)
2020-02-25 15:11:08 +02:00
Vitaliy
af95ad96b6 Remove unnecessary changes
(cherry picked from commit 6e22858749)
2020-02-25 15:11:06 +02:00
Vitaliy
318ffc541f Add check for general track
(cherry picked from commit 10c4e06aa1)
2020-02-25 15:11:02 +02:00
Vitaliy
2eb9b7d143 Fix possible npe
(cherry picked from commit 71c0167b19)
2020-02-25 15:10:57 +02:00
max-klaus
0a1d9e03a8
Merge pull request #8555 from osmandapp/small_fixes
Fix dateFormat error for different threads
2020-02-25 16:08:40 +03:00
Vitaliy
8194d599c5 Remove unnecessary changes 2020-02-25 15:07:22 +02:00
Dima-1
19f29564f1 Fix #8513 General settings: icons color bug 2020-02-25 14:19:44 +02:00
MadWasp79
2d87bdc06e add speed setting to brouter and direct to 2020-02-25 14:15:18 +02:00
Vitaliy
a60584d0d4 Fix dateFormat for different threads 2020-02-25 14:14:45 +02:00
max-klaus
d29e839ed9 Merge branch 'r3.6' 2020-02-25 14:31:34 +03:00
max-klaus
f2b1040ebc
Merge pull request #8534 from osmandapp/avoid_roads_export_import
Avoid roads export import
2020-02-25 14:27:58 +03:00
veliymolfar
ae7fd7710a refactor & app bar shadow 2020-02-25 13:23:42 +02:00
max-klaus
b58178b5db
Merge pull request #8551 from osmandapp/small_fixes
Fix possible npe
2020-02-25 14:12:41 +03:00
veliymolfar
dd35175ae4 refactor import layout 2020-02-25 12:48:20 +02:00
Dima-1
c02d1be6f6 Fix formatting 2020-02-25 12:15:01 +02:00
Vitaliy
6e22858749 Remove unnecessary changes 2020-02-25 12:12:54 +02:00
Vitaliy
10c4e06aa1 Add check for general track 2020-02-25 12:07:01 +02:00
veliymolfar
38919196f0 settingsImporter refactor 2020-02-25 12:00:51 +02:00
Dima-1
df8b6cc27a Merge branch 'master' into Fix_6669_save_button
# Conflicts:
#	OsmAnd/res/layout/fragment_edit_poi.xml
2020-02-25 11:48:52 +02:00
Dima-1
f14b39e8ad Fix #6669 OSM Editing screen: show Save button above keyboard. 2020-02-25 11:44:45 +02:00
Dmitriy Ruban
03fd123419
Merge branch 'r3.6' into avoid_roads_export_import 2020-02-25 11:20:07 +02:00
veliymolfar
123274a614 strings sc conflict 2020-02-25 11:15:48 +02:00
Vitaliy
71c0167b19 Fix possible npe 2020-02-25 11:09:33 +02:00
veliymolfar
fb428c931b refactor duplicateItems 2020-02-25 11:05:27 +02:00
max-klaus
f7ac5286ee Fix fillRuleArray out of bounds 2020-02-25 11:26:24 +03:00
max-klaus
9a0dfac9a3 Fix fillRuleArray out of bounds 2020-02-25 11:24:15 +03:00
Victor Shcherb
30c3898a5f Fix #8319 2020-02-24 18:41:40 +01:00