libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 03:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Remove a few differences with ScummVM

Browse Source
This commit is contained in:
Dries Harnie 2020-05-23 17:29:11 +02:00
parent fb7260c406
commit 2d4b666aa1
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
backends/platform/android/android.cpp
View File

@ -403,17 +403,20 @@ void OSystem_Android::initBackend() {
}
bool OSystem_Android::hasFeature(Feature f) {
return (f == kFeatureFullscreenMode ||
f == kFeatureAspectRatioCorrection ||
f == kFeatureCursorPalette ||
f == kFeatureVirtualKeyboard ||
#ifdef USE_OPENGL
f == kFeatureOpenGL ||
#endif
f == kFeatureOverlaySupportsAlpha ||
if (f == kFeatureVirtualKeyboard ||
f == kFeatureOpenUrl ||
f == kFeatureTouchpadMode ||
f == kFeatureClipboardSupport);
f == kFeatureOnScreenControl ||
f == kFeatureFullscreenMode ||
f == kFeatureClipboardSupport ||
f == kFeatureAspectRatioCorrection ||
f == kFeatureCursorPalette ||
f == kFeatureOpenGL ||
f == kFeatureOverlaySupportsAlpha ||
f == kFeatureClipboardSupport) {
return true;
}
return false;
}
void OSystem_Android::setFeatureState(Feature f, bool enable) {
@ -441,6 +444,10 @@ void OSystem_Android::setFeatureState(Feature f, bool enable) {
ConfMan.setBool("touchpad_mouse_mode", enable);
_touchpad_mode = enable;
break;
case kFeatureOnScreenControl:
ConfMan.setBool("onscreen_control", enable);
JNI::showKeyboardControl(enable);
break;
default:
break;
}
@ -458,6 +465,8 @@ bool OSystem_Android::getFeatureState(Feature f) {
return _use_mouse_palette;
case kFeatureTouchpadMode:
return ConfMan.getBool("touchpad_mouse_mode");
case kFeatureOnScreenControl:
return ConfMan.getBool("onscreen_control");
default:
return false;
}
@ -552,15 +561,13 @@ void OSystem_Android::getTimeAndDate(TimeDate &td) const {
td.tm_wday = tm.tm_wday;
}
void OSystem_Android::addSysArchivesToSearchSet(Common::SearchSet &s,
int priority) {
void OSystem_Android::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
ENTER("");
JNI::addSysArchivesToSearchSet(s, priority);
}
void OSystem_Android::logMessage(LogMessageType::Type type,
const char *message) {
void OSystem_Android::logMessage(LogMessageType::Type type, const char *message) {
switch (type) {
case LogMessageType::kInfo:
__android_log_write(ANDROID_LOG_INFO, android_log_tag, message);