gwh/LightningLauncher-TrianguloY
1
0
Fork 0
mirror of https://github.com/TrianguloY/LightningLauncher.git synced 2024-12-26 09:58:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve the handling of display cutouts / navbar size, although this is not yet satisfying.

Browse source
This commit is contained in:
Pierrot 2019-04-03 14:59:54 +02:00
parent be4ade6a56
commit a60e435fb3
2 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/llx/core/src/main/java/com/readystatesoftware/systembartint/SystemBarTintManager.java
View file

@ -362,6 +362,13 @@ public class SystemBarTintManager {
// private final int mNavigationBarWidth;
private final boolean mIsNavigationAtBottom;
// These values are kept in order to be reused when the window insets are not available. This
// is the case when the view is not attached to the window. Also, display cutouts are never
// available in the context of the overlay desktop. Display cutouts are not supposed to change
// so it should be safe enough.
private static int sSafeInsetWidth = 0;
private static int sSafeInsetHeight = 0;
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
private SystemBarConfig(Window window) {
Resources res = window.getContext().getResources();
@ -383,23 +390,21 @@ public class SystemBarTintManager {
DisplayMetrics realDm = new DisplayMetrics();
window.getWindowManager().getDefaultDisplay().getRealMetrics(realDm);
int dw = 0;
int dh = 0;
if (Build.VERSION.SDK_INT >= 28) {
WindowInsets windowInsets = window.getDecorView().getRootWindowInsets();
if(windowInsets != null) {
DisplayCutout cutout = windowInsets.getDisplayCutout();
if(cutout != null) {
dw = cutout.getSafeInsetLeft() + cutout.getSafeInsetRight();
dh = cutout.getSafeInsetTop() + cutout.getSafeInsetBottom();
sSafeInsetWidth = cutout.getSafeInsetLeft() + cutout.getSafeInsetRight();
sSafeInsetHeight = cutout.getSafeInsetTop() + cutout.getSafeInsetBottom();
}
}
}
mIsNavigationAtBottom = realDm.widthPixels == dm.widthPixels;
if(mIsInPortrait || mIsNavigationAtBottom) {
mNavigationBarHeight = realDm.heightPixels - dm.heightPixels - dh;
mNavigationBarHeight = realDm.heightPixels - dm.heightPixels - sSafeInsetHeight;
} else {
mNavigationBarHeight = realDm.widthPixels - dm.widthPixels - dw;
mNavigationBarHeight = realDm.widthPixels - dm.widthPixels - sSafeInsetWidth;
}
mHasNavigationBar = (mNavigationBarHeight > 0);
}

29
app/llx/core/src/main/java/net/pierrox/lightning_launcher/engine/Screen.java
View file

@ -189,6 +189,24 @@ public abstract class Screen implements ItemLayout.ItemLayoutListener, ItemView.
}
}
};
mContentView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@Override
public void onViewAttachedToWindow(View view) {
// select API 28 because this is linked with the display cutout stuff
if (Build.VERSION.SDK_INT >= 28) {
WindowInsets insets = mContentView.getRootWindowInsets();
if (insets != null) {
mSystemBarTintManager.onConfigurationChanged(mWindow);
onSystemBarsSizeChanged();
}
}
}
@Override
public void onViewDetachedFromWindow(View view) {
}
});
}
}
@ -300,17 +318,6 @@ public abstract class Screen implements ItemLayout.ItemLayoutListener, ItemView.
if(Build.VERSION.SDK_INT>=19) {
mSystemBarTintManager = new SystemBarTintManager(mWindow);
}
if (Build.VERSION.SDK_INT >= 20) {
window.getDecorView().setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
@Override
public WindowInsets onApplyWindowInsets(View view, WindowInsets windowInsets) {
mSystemBarTintManager.onConfigurationChanged(mWindow);
onSystemBarsSizeChanged();
return windowInsets;
}
});
}
}
public void setVisibility(boolean visible) {