aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorCameron Cawley2019-10-13 18:58:57 +0100
committerFilippos Karapetis2020-01-11 18:03:02 +0200
commit97c3ac5c2c92cd452bcfc905d1f56b20445dee84 (patch)
tree010a3b2d4818babff085d2ff688e866f65ede516 /backends/platform
parent6bf14cf5477f55ccee4414d8b081cd6d71afd163 (diff)
downloadscummvm-rg350-97c3ac5c2c92cd452bcfc905d1f56b20445dee84.tar.gz
scummvm-rg350-97c3ac5c2c92cd452bcfc905d1f56b20445dee84.tar.bz2
scummvm-rg350-97c3ac5c2c92cd452bcfc905d1f56b20445dee84.zip
ANDROID: Hide the system mouse cursor on Android N
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java23
1 files changed, 15 insertions, 8 deletions
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index f55639f60b..20fa482b66 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -21,6 +21,7 @@ import android.view.View;
import android.view.SurfaceView;
import android.view.SurfaceHolder;
import android.view.MotionEvent;
+import android.view.PointerIcon;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.Toast;
@@ -403,13 +404,19 @@ public class ScummVMActivity extends Activity {
}
private void showMouseCursor(boolean show) {
- /* Currently hiding the system mouse cursor is only
- supported on OUYA. If other systems provide similar
- intents, please add them here as well */
- Intent intent =
- new Intent(show?
- "tv.ouya.controller.action.SHOW_CURSOR" :
- "tv.ouya.controller.action.HIDE_CURSOR");
- sendBroadcast(intent);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ SurfaceView main_surface = (SurfaceView)findViewById(R.id.main_surface);
+ int type = show ? PointerIcon.TYPE_DEFAULT : PointerIcon.TYPE_NULL;
+ main_surface.setPointerIcon(PointerIcon.getSystemIcon(this, type));
+ } else {
+ /* Currently hiding the system mouse cursor is only
+ supported on OUYA. If other systems provide similar
+ intents, please add them here as well */
+ Intent intent =
+ new Intent(show?
+ "tv.ouya.controller.action.SHOW_CURSOR" :
+ "tv.ouya.controller.action.HIDE_CURSOR");
+ sendBroadcast(intent);
+ }
}
}