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

Commit 35e77fa8 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Revert "DisplayCutout: Add back always resource"" into pi-dev am: 665a6b21 

am: 871bb33c

Change-Id: I3471704ee81dc51c59f0798ab8319352d5b521a6
parents 28bad11b 871bb33c

core/res/res/values/attrs.xml

+0 −3
Original line number Diff line number Diff line
@@ -2154,9 +2154,6 @@ 
            Corresponds to <code>LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES</code>.

            -->

            <enum name="shortEdges" value="1" />

            <!-- Use <code>shortEdges</code> instead. This is temporarily here to unblock pushing

                 the SDK until all usages have been migrated to <code>shortEdges</code> -->

            <enum name="always" value="1" />

            <!-- <p>

            The window is never allowed to overlap with the <code>DisplayCutout</code> area.

            <p>