Skip to content

Fix black bar on cutout side after device rotation #1938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rybnikov wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −25
Open

Fix black bar on cutout side after device rotation #1938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 2 additions & 23 deletions TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -36,8 +35,6 @@ public class DrawerLayoutContainer extends FrameLayout {

private int behindKeyboardColor;

private boolean hasCutout;

private boolean inLayout;

public boolean allowDrawContent = true;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions TMessagesProj/src/main/res/values-v31/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<item name="android:calendarViewStyle">@style/Theme.TMessages.CalendarView</item>
<item name="android:navigationBarColor">#000000</item>
<item name="android:textViewStyle">@style/MyTextViewStyle</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
<item name="android:forceDarkAllowed">false</item>
</style>

Expand All @@ -82,7 +82,7 @@
<item name="android:calendarViewStyle">@style/Theme.TMessages.CalendarView</item>
<item name="android:navigationBarColor">#000000</item>
<item name="android:textViewStyle">@style/MyTextViewStyle</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
<item name="android:forceDarkAllowed">false</item>
</style>

Expand Down