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

Commit 3dfc3ca7 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix cts test failure of EnsureBarContrastTest" am: 528a63d7 am: 02896e98 am: 7f326c9d 

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

Change-Id: Iabd9e3ac438fcc52a257d3d94a3c87ca17ca87e1
parents 257735b0 7f326c9d

services/core/java/com/android/server/wm/DisplayPolicy.java

+9 −5
Original line number Diff line number Diff line
@@ -1616,11 +1616,15 @@ public class DisplayPolicy { 
                    statusBarBottom);

        }



        sTmpRect.set(windowFrames.mFrame);

        sTmpRect.intersect(displayFrames.mDisplayCutoutSafe);

        sTmpRect.top = windowFrames.mFrame.top; // Ignore top display cutout inset

        sTmpRect.bottom = statusBarBottom; // Use collapsed status bar size

        contentFrame.set(sTmpRect);

        final InsetsState state = displayFrames.mInsetsState;

        sTmpRect.set(displayFrames.mDisplayCutoutSafe);

        // The status bar content can extend into regular display cutout insets but not

        // waterfall insets.

        sTmpRect.top = Math.max(state.getDisplayCutout().getWaterfallInsets().top, 0);



        contentFrame.set(windowFrames.mFrame);

        contentFrame.intersect(sTmpRect);

        contentFrame.bottom = statusBarBottom; // Use collapsed status bar size

    }



    private int layoutNavigationBar(DisplayFrames displayFrames, Rect contentFrame) {