From 11a4e3cc58f022e5f150a3618ac4a05657e30878 Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Tue, 30 Jan 2018 13:10:41 +0200
Subject: [PATCH 1/3] Fixed time picker for lanscape

---
 .../layout-land/parking_set_time_limit.xml    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 OsmAnd/res/layout-land/parking_set_time_limit.xml

diff --git a/OsmAnd/res/layout-land/parking_set_time_limit.xml b/OsmAnd/res/layout-land/parking_set_time_limit.xml
new file mode 100644
index 0000000000..dbdf4edfbd
--- /dev/null
+++ b/OsmAnd/res/layout-land/parking_set_time_limit.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:paddingBottom="@dimen/dialog_content_bottom_margin"
+              android:paddingLeft="@dimen/dialog_content_margin"
+              android:paddingRight="@dimen/dialog_content_margin"
+              android:paddingTop="@dimen/dialog_content_bottom_margin">
+
+    <TextView
+        android:id="@+id/parkTime"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_gravity="center"
+        android:text="@string/osmand_parking_position_description_add"/>
+
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/osmand_parking_hours"/>
+
+            <TimePicker
+                android:id="@+id/parking_time_picker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/osmand_parking_minutes"/>
+        </LinearLayout>
+    </ScrollView>
+
+    <CheckBox
+        android:id="@+id/check_event_in_calendar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        android:text="@string/osmand_parking_add_event"/>
+
+</LinearLayout>

From b3085b38cbfd22ba35eade2b78b6ab888b0eb6f4 Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Tue, 30 Jan 2018 13:20:20 +0200
Subject: [PATCH 2/3] Made time picker for lanscape scrollable

---
 .../layout-land/parking_set_time_limit.xml    | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/OsmAnd/res/layout-land/parking_set_time_limit.xml b/OsmAnd/res/layout-land/parking_set_time_limit.xml
index dbdf4edfbd..9565af5655 100644
--- a/OsmAnd/res/layout-land/parking_set_time_limit.xml
+++ b/OsmAnd/res/layout-land/parking_set_time_limit.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:paddingBottom="@dimen/dialog_content_bottom_margin"
-              android:paddingLeft="@dimen/dialog_content_margin"
-              android:paddingRight="@dimen/dialog_content_margin"
-              android:paddingTop="@dimen/dialog_content_bottom_margin">
 
-    <TextView
-        android:id="@+id/parkTime"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_gravity="center"
-        android:text="@string/osmand_parking_position_description_add"/>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="1">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/dialog_content_bottom_margin"
+        android:paddingLeft="@dimen/dialog_content_margin"
+        android:paddingRight="@dimen/dialog_content_margin"
+        android:paddingTop="@dimen/dialog_content_bottom_margin">
+
+        <TextView
+            android:id="@+id/parkTime"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:text="@string/osmand_parking_position_description_add"/>
+
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:layout_height="0dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:orientation="horizontal">>
 
             <TextView
                 android:id="@+id/textView1"
@@ -45,13 +48,14 @@
                 android:layout_gravity="center_vertical"
                 android:text="@string/osmand_parking_minutes"/>
         </LinearLayout>
-    </ScrollView>
 
-    <CheckBox
-        android:id="@+id/check_event_in_calendar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:text="@string/osmand_parking_add_event"/>
 
-</LinearLayout>
+        <CheckBox
+            android:id="@+id/check_event_in_calendar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/osmand_parking_add_event"/>
+    </LinearLayout>
+</ScrollView>
+

From a29596d81ef12a13e194c2fff2dc6cf09b9c708e Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 30 Jan 2018 14:17:49 +0200
Subject: [PATCH 3/3] Fix #4868

---
 .../src/net/osmand/plus/mapillary/MapillaryImageDialog.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryImageDialog.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryImageDialog.java
index 775ae2b11c..950a01ee3c 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryImageDialog.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryImageDialog.java
@@ -12,11 +12,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.ConsoleMessage;
 import android.webkit.JavascriptInterface;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
@@ -237,7 +233,7 @@ public class MapillaryImageDialog extends ContextMenuCardDialog {
 		view.setLayoutParams(lp);
 		webView.setWebViewClient(new WebViewClient() {
 			@Override
-			public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+			public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
 				webView.loadUrl("about:blank");
 				noInternetView.setVisibility(View.VISIBLE);
 			}