summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs')
-rw-r--r--Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
index 223d3a8..4d58821 100644
--- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
@@ -21,6 +21,7 @@ using AToolbar = Android.Support.V7.Widget.Toolbar;
using AColor = Android.Graphics.Color;
using AlertDialog = Android.Support.V7.App.AlertDialog;
using ARelativeLayout = Android.Widget.RelativeLayout;
+using Xamarin.Forms.Internals;
#endregion
@@ -56,6 +57,8 @@ namespace Xamarin.Forms.Platform.Android
_currentState = AndroidApplicationLifecycleState.Uninitialized;
}
+ IApplicationController Controller => _application;
+
public event EventHandler ConfigurationChanged;
int IStartActivityForResult.RegisterActivityResultCallback(Action<Result, Intent> callback)
@@ -126,7 +129,7 @@ namespace Xamarin.Forms.Platform.Android
_application = application;
(application as IApplicationController)?.SetAppIndexingProvider(new AndroidAppIndexProvider(this));
- Xamarin.Forms.Application.Current = application;
+ Xamarin.Forms.Application.SetCurrentApplication(application);
SetSoftInputMode();
@@ -354,7 +357,7 @@ namespace Xamarin.Forms.Platform.Android
}
catch (Exception ex)
{
- Log.Warning("Xamarin.Forms.Platform.Android.FormsAppCompatActivity", "Error retrieving color resource: {0}", ex);
+ Internals.Log.Warning("Xamarin.Forms.Platform.Android.FormsAppCompatActivity", "Error retrieving color resource: {0}", ex);
}
return -1;