Merge "Add rounded corners to letterbox when taskbar is visible" into tm-qpr-dev

This commit is contained in:
Oleg Blinnikov
2022-11-29 15:47:35 +00:00
committed by Android (Google) Code Review

View File

@@ -87,10 +87,6 @@ final class LetterboxUiController {
private final LetterboxConfiguration mLetterboxConfiguration; private final LetterboxConfiguration mLetterboxConfiguration;
private final ActivityRecord mActivityRecord; private final ActivityRecord mActivityRecord;
// Taskbar expanded height. Used to determine whether to crop an app window to display rounded
// corners above the taskbar.
private final float mExpandedTaskBarHeight;
private boolean mShowWallpaperForLetterboxBackground; private boolean mShowWallpaperForLetterboxBackground;
@Nullable @Nullable
@@ -102,8 +98,6 @@ final class LetterboxUiController {
// is created in its constructor. It shouldn't be used in this constructor but it's safe // is created in its constructor. It shouldn't be used in this constructor but it's safe
// to use it after since controller is only used in ActivityRecord. // to use it after since controller is only used in ActivityRecord.
mActivityRecord = activityRecord; mActivityRecord = activityRecord;
mExpandedTaskBarHeight =
getResources().getDimensionPixelSize(R.dimen.taskbar_frame_height);
} }
/** Cleans up {@link Letterbox} if it exists.*/ /** Cleans up {@link Letterbox} if it exists.*/
@@ -558,7 +552,6 @@ final class LetterboxUiController {
final InsetsSource taskbarInsetsSource = getTaskbarInsetsSource(mainWindow); final InsetsSource taskbarInsetsSource = getTaskbarInsetsSource(mainWindow);
return taskbarInsetsSource != null return taskbarInsetsSource != null
&& taskbarInsetsSource.getFrame().height() >= mExpandedTaskBarHeight
&& taskbarInsetsSource.isVisible(); && taskbarInsetsSource.isVisible();
} }