Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb006359 authored by Oleg Blinnikov's avatar Oleg Blinnikov Committed by Automerger Merge Worker
Browse files

Merge "Add rounded corners to letterbox when taskbar is visible" into...

Merge "Add rounded corners to letterbox when taskbar is visible" into tm-qpr-dev am: 3d1c9948 am: 01974b59

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20582006



Change-Id: Ia5f2ab9b86fb7158597c68e4fea5eaf0f54ff2b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 032d8126 01974b59
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -87,10 +87,6 @@ final class LetterboxUiController {
    private final LetterboxConfiguration mLetterboxConfiguration;
    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;

    @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
        // to use it after since controller is only used in ActivityRecord.
        mActivityRecord = activityRecord;
        mExpandedTaskBarHeight =
                getResources().getDimensionPixelSize(R.dimen.taskbar_frame_height);
    }

    /** Cleans up {@link Letterbox} if it exists.*/
@@ -558,7 +552,6 @@ final class LetterboxUiController {
        final InsetsSource taskbarInsetsSource = getTaskbarInsetsSource(mainWindow);

        return taskbarInsetsSource != null
                && taskbarInsetsSource.getFrame().height() >= mExpandedTaskBarHeight
                && taskbarInsetsSource.isVisible();
    }