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

Commit 8fac4068 authored by Yunfan Chen's avatar Yunfan Chen Committed by Android (Google) Code Review
Browse files

Merge "If decouple flag turns on, skip legacy value verification" into main

parents d16f00c7 ef8c2cb4
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import android.view.DisplayInfo;

import androidx.test.filters.SmallTest;

import com.android.window.flags.Flags;

import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ErrorCollector;
@@ -142,12 +144,20 @@ public class DisplayPolicyInsetsTests extends DisplayPolicyTestsBase {

    private void verifyStableInsets(DisplayInfo di, int left, int top,
            int right, int bottom) {
        if (Flags.insetsDecoupledConfiguration()) {
            // TODO: update the verification to match the new behavior.
            return;
        }
        mErrorCollector.checkThat("stableInsets", getStableInsets(di),
                equalTo(new Rect(left, top, right, bottom)));
    }

    private void verifyNonDecorInsets(DisplayInfo di, int left, int top,
            int right, int bottom) {
        if (Flags.insetsDecoupledConfiguration()) {
            // TODO: update the verification to match the new behavior.
            return;
        }
        mErrorCollector.checkThat("nonDecorInsets",
                getNonDecorInsets(di), equalTo(new Rect(left, top, right, bottom)));
    }