summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2016-09-13 12:51:57 +0100
committerGitHub <noreply@github.com>2016-09-13 12:51:57 +0100
commit960f02d0e7549088d15b74bd11628eb987c77a74 (patch)
treee3a4638d597b7aa1aa818fc6ba4fdbc832764779
parentd8f939ff6eee0a8f2ecc9392cbdb898e3d140d8b (diff)
downloadxamarin-forms-960f02d0e7549088d15b74bd11628eb987c77a74.tar.gz
xamarin-forms-960f02d0e7549088d15b74bd11628eb987c77a74.tar.bz2
xamarin-forms-960f02d0e7549088d15b74bd11628eb987c77a74.zip
[Android] Fix warnings (#346)
-rw-r--r--Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs8
-rw-r--r--Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs8
-rw-r--r--Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs1
3 files changed, 7 insertions, 10 deletions
diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
index b200e27b..ab2fb61a 100644
--- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
@@ -414,10 +414,6 @@ namespace Xamarin.Forms.Platform.Android
{
_busyCount = Math.Max(0, enabled ? _busyCount + 1 : _busyCount - 1);
- if (!Forms.SupportsProgress)
- return;
-
- SetProgressBarIndeterminate(true);
UpdateProgressBarVisibility(_busyCount > 0);
}
@@ -491,8 +487,10 @@ namespace Xamarin.Forms.Platform.Android
{
if (!Forms.SupportsProgress)
return;
-
+#pragma warning disable 612, 618
+ SetProgressBarIndeterminate(true);
SetProgressBarIndeterminateVisibility(isBusy);
+#pragma warning restore 612, 618
}
internal class DefaultApplication : Application
diff --git a/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs b/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
index adb27f77..c8795c6a 100644
--- a/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
+++ b/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
@@ -243,11 +243,6 @@ namespace Xamarin.Forms.Platform.Android
MessagingCenter.Subscribe(this, Page.BusySetSignalName, (Page sender, bool enabled) =>
{
busyCount = Math.Max(0, enabled ? busyCount + 1 : busyCount - 1);
-
- if (!Forms.SupportsProgress)
- return;
-
- SetProgressBarIndeterminate(true);
UpdateProgressBarVisibility(busyCount > 0);
});
@@ -338,7 +333,10 @@ namespace Xamarin.Forms.Platform.Android
{
if (!Forms.SupportsProgress)
return;
+#pragma warning disable 612, 618
+ SetProgressBarIndeterminate(true);
SetProgressBarIndeterminateVisibility(isBusy);
+#pragma warning restore 612, 618
}
internal class DefaultApplication : Application
diff --git a/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
index bd5b8059..8efc41e1 100644
--- a/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
@@ -201,6 +201,7 @@ namespace Xamarin.Forms.Platform.Android
base.OnReceivedError(view, request, error);
}
+ [Obsolete]
public override bool ShouldOverrideUrlLoading(AWebView view, string url)
{
if (_renderer.Element == null)