Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Workaround orientation bug in Android when unlocking the screen.

Browse Source 
Or I'm doing something wrong somewhere...

Also kill off "Auto" orientation. It's just a pain.

Fixes #10128
This commit is contained in:
Henrik Rydgård 2017-11-16 12:23:10 +01:00
parent cabfec32c8
commit 53a351c29d
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/GameSettingsScreen.cpp
View File

@ -677,8 +677,8 @@ void GameSettingsScreen::CreateViews() {
#if PPSSPP_PLATFORM(ANDROID)
if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_MOBILE) {
static const char *screenRotation[] = {"Auto", "Landscape", "Portrait", "Landscape Reversed", "Portrait Reversed"};
PopupMultiChoice *rot = systemSettings->Add(new PopupMultiChoice(&g_Config.iScreenRotation, co->T("Screen Rotation"), screenRotation, 0, ARRAY_SIZE(screenRotation), co->GetName(), screenManager()));
static const char *screenRotation[] = {"Landscape", "Portrait", "Landscape Reversed", "Portrait Reversed"};
PopupMultiChoice *rot = systemSettings->Add(new PopupMultiChoice(&g_Config.iScreenRotation, co->T("Screen Rotation"), screenRotation, 1, ARRAY_SIZE(screenRotation), co->GetName(), screenManager()));
rot->OnChoice.Handle(this, &GameSettingsScreen::OnScreenRotation);
if (System_GetPropertyBool(SYSPROP_SUPPORTS_SUSTAINED_PERF_MODE)) {

38
android/src/org/ppsspp/ppsspp/NativeActivity.java
View File

@ -310,7 +310,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
// OK, config should be initialized, we can query for screen rotation.
if (Build.VERSION.SDK_INT >= 9) {
updateScreenRotation();
updateScreenRotation("Initialize");
}
// Detect OpenGL support.
@ -355,7 +355,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
}
@TargetApi(9)
private void updateScreenRotation() {
private void updateScreenRotation(String cause) {
// Query the native application on the desired rotation.
int rot = 0;
String rotString = NativeApp.queryConfig("screenRotation");
@ -365,11 +365,12 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
Log.e(TAG, "Invalid rotation: " + rotString);
return;
}
Log.i(TAG, "Setting requested rotation: " + rot + " ('" + rotString + "')");
Log.i(TAG, "Setting requested rotation: " + rot + " ('" + rotString + "') (" + cause + ")");
switch (rot) {
case 0:
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
// Auto is no longer supported.
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
break;
case 1:
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
@ -462,7 +463,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
refreshRate = display.getRefreshRate();
// OK, config should be initialized, we can query for screen rotation.
updateScreenRotation();
updateScreenRotation("onCreate");
updateSustainedPerformanceMode();
// Keep the screen bright - very annoying if it goes dark when tilting away
@ -524,7 +525,18 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
public void surfaceCreated(SurfaceHolder holder) {
pixelWidth = holder.getSurfaceFrame().width();
pixelHeight = holder.getSurfaceFrame().height();
Log.d(TAG, "Surface created. pixelWidth=" + pixelWidth + ", pixelHeight=" + pixelHeight + " holder: " + holder.toString());
// Workaround for terrible bug when locking and unlocking the screen in landscape mode on Nexus 5X.
int requestedOr = getRequestedOrientation();
boolean requestedPortrait = requestedOr == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT || requestedOr == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
boolean detectedPortrait = pixelHeight > pixelWidth;
if (requestedPortrait != detectedPortrait) {
Log.e(TAG, "Bad orientation detected! Recreating activity.");
recreate();;
return;
}
Log.d(TAG, "Surface created. pixelWidth=" + pixelWidth + ", pixelHeight=" + pixelHeight + " holder: " + holder.toString() + " or: " + requestedOr);
NativeApp.setDisplayParameters(pixelWidth, pixelHeight, (int)densityDpi, refreshRate);
getDesiredBackbufferSize(desiredSize);
@ -687,7 +699,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
}
// OK, config should be initialized, we can query for screen rotation.
if (javaGL || Build.VERSION.SDK_INT >= 9) {
updateScreenRotation();
updateScreenRotation("onResume");
}
Log.i(TAG, "onResume");
@ -840,10 +852,10 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
return input.getDescriptor();
} else {
List<InputDevice.MotionRange> motions = input.getMotionRanges();
String fakeid = "";
StringBuilder fakeid = new StringBuilder();
for (InputDevice.MotionRange range : motions)
fakeid += range.getAxis();
return fakeid;
fakeid.append(range.getAxis());
return fakeid.toString();
}
}
@ -999,7 +1011,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
input.selectAll();
// Lovely!
AlertDialog.Builder bld = null;
AlertDialog.Builder bld;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
bld = new AlertDialog.Builder(this);
else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH)
@ -1181,13 +1193,13 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
finish();
} else if (command.equals("rotate")) {
if (javaGL) {
updateScreenRotation();
updateScreenRotation("rotate");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
Log.i(TAG, "Must recreate activity on rotation");
}
} else {
if (Build.VERSION.SDK_INT >= 9) {
updateScreenRotation();
updateScreenRotation("rotate");
}
}
} else if (command.equals("sustainedPerfMode")) {

1
android/src/org/ppsspp/ppsspp/PpssppActivity.java
View File

@ -92,6 +92,7 @@ public class PpssppActivity extends NativeActivity {
super.onCreate(savedInstanceState);
}
// called by the C++ code through JNI. Dispatch anything we can't directly handle
// on the gfx thread to the UI thread.
public void postCommand(String command, String parameter) {