diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
index 3a9418d8429..200064731af 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
@@ -20,7 +20,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.Insets;
-import androidx.core.view.DisplayCutoutCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
@@ -36,8 +35,6 @@ public class DrawerLayoutContainer extends FrameLayout {
private int behindKeyboardColor;
- private boolean hasCutout;
-
private boolean inLayout;
public boolean allowDrawContent = true;
@@ -75,10 +72,6 @@ public DrawerLayoutContainer(Context context) {
firstLayout = false;
drawerLayoutContainer.setWillNotDraw(insets.getSystemWindowInsetTop() <= 0 && getBackground() == null);
- if (Build.VERSION.SDK_INT >= 28) {
- DisplayCutoutCompat cutout = insets.getDisplayCutout();
- hasCutout = cutout != null && !cutout.getBoundingRects().isEmpty();
- }
invalidate();
return onApplyWindowInsets(v, insets);
@@ -203,8 +196,7 @@ protected void onDraw(@NonNull Canvas canvas) {
}
final Insets insets = lastWindowInsetsCompat.getInsets(WindowInsetsCompat.Type.ime()
- | WindowInsetsCompat.Type.systemBars()
- | WindowInsetsCompat.Type.displayCutout());
+ | WindowInsetsCompat.Type.systemBars());
if (insets.bottom > 0) {
backgroundPaint.setColor(behindKeyboardColor);
@@ -216,18 +208,6 @@ protected void onDraw(@NonNull Canvas canvas) {
internalNavbarPaint
);
}
-
- if (hasCutout) {
- backgroundPaint.setColor(0xff000000);
- int left = insets.left;
- if (left != 0) {
- canvas.drawRect(0, 0, left, getMeasuredHeight(), backgroundPaint);
- }
- int right = insets.right;
- if (right != 0) {
- canvas.drawRect(right, 0, getMeasuredWidth(), getMeasuredHeight(), backgroundPaint);
- }
- }
}
@Override
@@ -270,8 +250,7 @@ private void dispatchApplyWindowInsetsInternal(View child, WindowInsetsCompat in
final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();
final Insets systemInsetsWithIme = insets.getInsets(WindowInsetsCompat.Type.ime()
- | WindowInsetsCompat.Type.systemBars()
- | WindowInsetsCompat.Type.displayCutout());
+ | WindowInsetsCompat.Type.systemBars());
final boolean changed = lp.topMargin != 0 || lp.bottomMargin != 0
|| lp.leftMargin != systemInsetsWithIme.left
diff --git a/TMessagesProj/src/main/res/values-v31/styles.xml b/TMessagesProj/src/main/res/values-v31/styles.xml
index acec6de2c4e..1d587f838a9 100644
--- a/TMessagesProj/src/main/res/values-v31/styles.xml
+++ b/TMessagesProj/src/main/res/values-v31/styles.xml
@@ -56,7 +56,7 @@
- @style/Theme.TMessages.CalendarView
- #000000
- @style/MyTextViewStyle
- - shortEdges
+ - always
- false
@@ -82,7 +82,7 @@
- @style/Theme.TMessages.CalendarView
- #000000
- @style/MyTextViewStyle
- - shortEdges
+ - always
- false