diff options
| author | Rui Marinho <me@ruimarinho.net> | 2016-09-13 22:52:47 +0100 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2016-09-13 22:52:47 +0100 |
| commit | e6a2bed3b2a532aa2f937fc6a2957458f4680ef9 (patch) | |
| tree | 57f9c6e0eb083a8a067f9400b4db1426d1d5738f | |
| parent | 170f165bb2b5517a2b8e75f830dfa94067b9e473 (diff) | |
| download | xamarin-forms-e6a2bed3b2a532aa2f937fc6a2957458f4680ef9.tar.gz xamarin-forms-e6a2bed3b2a532aa2f937fc6a2957458f4680ef9.tar.bz2 xamarin-forms-e6a2bed3b2a532aa2f937fc6a2957458f4680ef9.zip | |
Revert "Revert "[Android] Fix warnings (#346)""
This reverts commit 6fa569cfda33d6875896788bba274a313a24fac2.
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) |