Hide the mouse cursor during pointer capture to work around DeX bug

This commit is contained in:
Cameron Gutman 2018-12-19 15:06:46 +05:00
parent 5c175fecf6
commit 16b845ab84
2 changed files with 23 additions and 3 deletions

View File

@ -1,27 +1,46 @@
package com.limelight.binding.input.capture;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.os.Build;
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.PointerIcon;
import android.view.View;
import android.view.ViewGroup;
@TargetApi(Build.VERSION_CODES.O)
public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {
private Context context;
private View targetView;
private ViewGroup rootViewGroup;
public AndroidNativePointerCaptureProvider(View targetView) {
public AndroidNativePointerCaptureProvider(Activity activity, View targetView) {
this.context = activity;
this.targetView = targetView;
this.rootViewGroup = (ViewGroup) activity.getWindow().getDecorView();
}
public static boolean isCaptureProviderSupported() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
}
// DeX on Android 8.1 doesn't properly hide the mouse pointer when running in
// windowed mode, even though the cursor is properly captured (and thus doesn't move anymore).
// To work around this issue, hide the pointer icon when requesting pointer capture.
private void setPointerIconOnAllViews(PointerIcon icon) {
for (int i = 0; i < rootViewGroup.getChildCount(); i++) {
View view = rootViewGroup.getChildAt(i);
view.setPointerIcon(icon);
}
rootViewGroup.setPointerIcon(icon);
}
@Override
public void enableCapture() {
super.enableCapture();
setPointerIconOnAllViews(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
targetView.requestPointerCapture();
}
@ -29,6 +48,7 @@ public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {
public void disableCapture() {
super.disableCapture();
targetView.releasePointerCapture();
setPointerIconOnAllViews(null);
}
@Override

View File

@ -12,7 +12,7 @@ public class InputCaptureManager {
public static InputCaptureProvider getInputCaptureProvider(Activity activity, EvdevListener rootListener) {
if (AndroidNativePointerCaptureProvider.isCaptureProviderSupported()) {
LimeLog.info("Using Android O+ native mouse capture");
return new AndroidNativePointerCaptureProvider(activity.findViewById(R.id.surfaceView));
return new AndroidNativePointerCaptureProvider(activity, activity.findViewById(R.id.surfaceView));
}
// LineageOS implemented broken NVIDIA capture extensions, so avoid using them on root builds.
// See https://github.com/LineageOS/android_frameworks_base/commit/d304f478a023430f4712dbdc3ee69d9ad02cebd3