luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-05 06:10:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix keyboard insets on Android 15, again (#1497)

Browse source
This commit is contained in:
Eran Leshem 2025-04-26 08:34:27 +03:00 • committed by GitHub
parent 14b5439a97
commit 6d9f69a4b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 59 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

62
app/src/main/java/helium314/keyboard/latin/InputView.java
View file

@ -6,6 +6,9 @@
package helium314.keyboard.latin; package helium314.keyboard.latin;
import java.util.function.BiFunction;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Insets; import android.graphics.Insets;
import android.graphics.Rect; import android.graphics.Rect;
@ -18,6 +21,7 @@ import android.view.WindowManager;
import android.view.WindowMetrics; import android.view.WindowMetrics;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.annotation.RequiresApi;
import androidx.core.view.ViewKt; import androidx.core.view.ViewKt;
import helium314.keyboard.accessibility.AccessibilityUtils; import helium314.keyboard.accessibility.AccessibilityUtils;
@ -26,6 +30,7 @@ import helium314.keyboard.latin.common.ColorType;
import helium314.keyboard.latin.settings.Settings; import helium314.keyboard.latin.settings.Settings;
import helium314.keyboard.latin.suggestions.PopupSuggestionsView; import helium314.keyboard.latin.suggestions.PopupSuggestionsView;
import helium314.keyboard.latin.suggestions.SuggestionStripView; import helium314.keyboard.latin.suggestions.SuggestionStripView;
import helium314.keyboard.latin.utils.Log;
import kotlin.Unit; import kotlin.Unit;
@ -114,13 +119,17 @@ public final class InputView extends FrameLayout {
Settings.getValues().mColors.setBackground(findViewById(R.id.main_keyboard_frame), ColorType.MAIN_BACKGROUND); Settings.getValues().mColors.setBackground(findViewById(R.id.main_keyboard_frame), ColorType.MAIN_BACKGROUND);
if (Build.VERSION.SDK_INT >= 30) { if (Build.VERSION.SDK_INT >= 30) {
getLocationOnScreen(LOCATION);
WindowManager wm = getContext().getSystemService(WindowManager.class); WindowManager wm = getContext().getSystemService(WindowManager.class);
WindowMetrics windowMetrics = wm.getCurrentWindowMetrics(); WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();
if (LOCATION[1] + getHeight() == windowMetrics.getBounds().height()) {
if (Build.VERSION.SDK_INT >= 35 || isEdgeToEdge(windowMetrics)) {
// Edge-to-edge mode // Edge-to-edge mode
logInsets(wm.getMaximumWindowMetrics(), "max-metrics");
logInsets(wm.getCurrentWindowMetrics(), "current-metrics");
WindowInsets windowInsets = windowMetrics.getWindowInsets(); WindowInsets windowInsets = windowMetrics.getWindowInsets();
int insetTypes = WindowInsets.Type.systemBars() | WindowInsets.Type.displayCutout(); int insetTypes = WindowInsets.Type.systemBars() | WindowInsets.Type.displayCutout()
| WindowInsets.Type.systemGestures();
Insets insets = windowInsets.getInsetsIgnoringVisibility(insetTypes); Insets insets = windowInsets.getInsetsIgnoringVisibility(insetTypes);
// Can't set padding on this view, since it results in an overlap with window above the keyboard. // Can't set padding on this view, since it results in an overlap with window above the keyboard.
@ -133,6 +142,53 @@ public final class InputView extends FrameLayout {
return null; return null;
} }
@SuppressLint("DefaultLocale")
@RequiresApi(api = 30)
private boolean isEdgeToEdge(WindowMetrics windowMetrics) {
getLocationOnScreen(LOCATION);
Log.i("insets", String.format("Keyboard bottom: %d, screen height: %d.", LOCATION[1] + getHeight(),
windowMetrics.getBounds().height()));
return LOCATION[1] + getHeight() == windowMetrics.getBounds().height();
}
@RequiresApi(api = 30)
private static void logInsets(WindowMetrics metrics, String metricsType) {
logInsets(metrics, metricsType, WindowInsets::getInsets, "insets");
logInsets(metrics, metricsType, WindowInsets::getInsetsIgnoringVisibility, "insetsIgnoringVisibility");
}
@RequiresApi(api = 30)
private static void logInsets(WindowMetrics metrics, String metricsType,
BiFunction<WindowInsets, Integer, Insets> insetsGetter, String visibility) {
logInsets(metrics, metricsType, WindowInsets.Type.navigationBars(),"navigationBars",
insetsGetter, visibility);
logInsets(metrics, metricsType, WindowInsets.Type.systemBars(), "systemBars", insetsGetter, visibility);
logInsets(metrics, metricsType, WindowInsets.Type.statusBars(), "statusBars", insetsGetter, visibility);
logInsets(metrics, metricsType, WindowInsets.Type.displayCutout(),"displayCutout",
insetsGetter, visibility);
logInsets(metrics, metricsType, WindowInsets.Type.systemGestures(),"systemGestures",
insetsGetter, visibility);
logInsets(metrics, metricsType, WindowInsets.Type.mandatorySystemGestures(), "mandatorySystemGestures",
insetsGetter, visibility);
logInsets(metrics, metricsType, WindowInsets.Type.tappableElement(),"tappableElement",
insetsGetter, visibility);
if (Build.VERSION.SDK_INT >= 34) {
logInsets(metrics, metricsType, WindowInsets.Type.systemOverlays(), "systemOverlays",
insetsGetter, visibility);
}
}
@RequiresApi(api = 30)
@SuppressLint("DefaultLocale")
private static void logInsets(WindowMetrics metrics, String metricsType, int insetTypes, String insetsType,
BiFunction<WindowInsets, Integer, Insets> insetsGetter, String visibility) {
WindowInsets windowInsets = metrics.getWindowInsets();
Insets insets = insetsGetter.apply(windowInsets, insetTypes);
Log.i("insets", String.format("%s, %s, %s, bottom %d, top %d", metricsType, insetsType, visibility,
insets.bottom, insets.top));
}
/** /**
* This class forwards series of {@link MotionEvent}s from <code>SenderView</code> to * This class forwards series of {@link MotionEvent}s from <code>SenderView</code> to
* <code>ReceiverView</code>. * <code>ReceiverView</code>.