GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

android: fix detection of display cutouts

Browse source
This commit is contained in:
ardocrat 2023-07-16 10:39:26 +03:00
parent 6d3d0c76ef
commit d3d7ca3159
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/mw/gri/android/MainActivity.java
View file

@ -5,9 +5,11 @@ import android.os.Bundle;
import android.os.Process; import android.os.Process;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import androidx.core.graphics.Insets; import androidx.core.graphics.Insets;
import androidx.core.view.DisplayCutoutCompat;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsCompat;
import com.google.androidgamesdk.GameActivity; import com.google.androidgamesdk.GameActivity;
@ -51,16 +53,33 @@ public class MainActivity extends GameActivity {
// Start notification service. // Start notification service.
BackgroundService.start(this); BackgroundService.start(this);
// Listener for display cutouts to pass values into native code. // Listener for display insets (cutouts) to pass values into native code.
View content = getWindow().getDecorView().findViewById(android.R.id.content); View content = getWindow().getDecorView().findViewById(android.R.id.content);
ViewCompat.setOnApplyWindowInsetsListener(content, (v, insets) -> { ViewCompat.setOnApplyWindowInsetsListener(content, (v, insets) -> {
// Setup cutouts values.
DisplayCutoutCompat dc = insets.getDisplayCutout();
int cutoutTop = 0;
int cutoutRight = 0;
int cutoutBottom = 0;
int cutoutLeft = 0;
if (dc != null) {
cutoutTop = dc.getSafeInsetTop();
cutoutRight = dc.getSafeInsetRight();
cutoutBottom = dc.getSafeInsetBottom();
cutoutLeft = dc.getSafeInsetLeft();
}
// Get display insets.
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
// Setup values to pass into native code.
int[] cutouts = new int[]{0, 0, 0, 0}; int[] cutouts = new int[]{0, 0, 0, 0};
cutouts[0] = Utils.pxToDp(systemBars.top, this); cutouts[0] = Utils.pxToDp(Integer.max(cutoutTop, systemBars.top), this);
cutouts[1] = Utils.pxToDp(systemBars.right, this); cutouts[1] = Utils.pxToDp(Integer.max(cutoutRight, systemBars.right), this);
cutouts[2] = Utils.pxToDp(systemBars.bottom, this); cutouts[2] = Utils.pxToDp(Integer.max(cutoutBottom, systemBars.bottom), this);
cutouts[3] = Utils.pxToDp(systemBars.left, this); cutouts[3] = Utils.pxToDp(Integer.max(cutoutLeft, systemBars.left), this);
onDisplayCutouts(cutouts); onDisplayCutouts(cutouts);
return insets; return insets;
}); });
} }