diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs index 8264dc6744..da128cec96 100644 --- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs +++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs @@ -4,6 +4,7 @@ using Android.App; using Android.Content; using Android.Graphics; using Android.Graphics.Drawables; +using Android.OS; using Android.Runtime; using Android.Views; using AndroidX.AppCompat.App; @@ -387,7 +388,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform { if(Input != null) { - var args = new RawTextInputEventArgs(AndroidKeyboardDevice.Instance!, (ulong)Environment.TickCount64, InputRoot!, text); + var args = new RawTextInputEventArgs(AndroidKeyboardDevice.Instance!, (ulong)SystemClock.UptimeMillis(), InputRoot!, text); Input(args); } diff --git a/tests/Avalonia.Benchmarks/Rendering/AndroidRenderingBenchmarks.cs b/tests/Avalonia.Benchmarks/Rendering/AndroidRenderingBenchmarks.cs index bb6176f086..b671505b5d 100644 --- a/tests/Avalonia.Benchmarks/Rendering/AndroidRenderingBenchmarks.cs +++ b/tests/Avalonia.Benchmarks/Rendering/AndroidRenderingBenchmarks.cs @@ -97,7 +97,7 @@ namespace Avalonia.Benchmarks.Rendering return signaled; } - // TextInput timestamp: DateTime.Now vs TickCount64 (TopLevelImpl.cs) + // TextInput timestamp: DateTime.Now vs monotonic clock (TopLevelImpl.cs) [Benchmark] public ulong Current_TextInput_DateTimeNowTicks() @@ -111,12 +111,12 @@ namespace Avalonia.Benchmarks.Rendering } [Benchmark] - public long Optimized_TextInput_EnvironmentTickCount64() + public long Optimized_TextInput_StopwatchTimestamp() { long result = 0; for (int i = 0; i < FrameCount; i++) { - result = Environment.TickCount64; + result = System.Diagnostics.Stopwatch.GetTimestamp(); } return result; }