Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.retroarch.browser.retroactivity;

import android.content.res.Configuration;
import android.graphics.Rect;
import android.util.Log;
import android.view.Display;
import android.view.DisplayCutout;
import android.view.Gravity;
import android.view.PointerIcon;
Expand Down Expand Up @@ -163,35 +165,32 @@ && getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.VANILLA_ICE_CREA
updateDisplayCutoutSafeWindow(!writeOverNotch);
}

@SuppressWarnings("deprecation")
private void updateDisplayCutoutSafeWindow(boolean avoidDisplayCutout) {
if (!avoidDisplayCutout) {
mDecorView.setOnApplyWindowInsetsListener(null);
setDisplayCutoutSafeWindow(0, 0, 0, 0);
return;
}

mDecorView.setOnApplyWindowInsetsListener(
new View.OnApplyWindowInsetsListener() {
@Override
public WindowInsets onApplyWindowInsets(View view, WindowInsets insets) {
DisplayCutout cutout = insets.getDisplayCutout();

if (cutout != null)
setDisplayCutoutSafeWindow(
cutout.getSafeInsetLeft(),
cutout.getSafeInsetTop(),
cutout.getSafeInsetRight(),
cutout.getSafeInsetBottom());

return insets;
}
});
mDecorView.requestApplyInsets();
Display display = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
? getDisplay()
: getWindowManager().getDefaultDisplay();

DisplayCutout cutout = (display != null) ? display.getCutout() : null;

if (cutout != null)
setDisplayCutoutSafeWindow(
cutout.getSafeInsetLeft(),
cutout.getSafeInsetTop(),
cutout.getSafeInsetRight(),
cutout.getSafeInsetBottom());
else
setDisplayCutoutSafeWindow(0, 0, 0, 0);
}

private void setDisplayCutoutSafeWindow(
int left, int top, int right, int bottom) {
WindowMetrics metrics = getWindowManager().getMaximumWindowMetrics();
WindowMetrics metrics = getWindowManager().getCurrentWindowMetrics();
Rect bounds = metrics.getBounds();
boolean fullDisplay =
left == 0 && top == 0 && right == 0 && bottom == 0;
Expand Down Expand Up @@ -221,6 +220,17 @@ private void setDisplayCutoutSafeWindow(
getWindow().setAttributes(params);
}

@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
runOnUiThread(new Runnable() {
@Override
public void run() {
updateDisplayCutoutMode();
}
});
}

@Override
public void onStop() {
super.onStop();
Expand Down
Loading