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

Commit a912f79b authored by Rachit Jain's avatar Rachit Jain Committed by Android (Google) Code Review
Browse files

Merge "Create a new safe region letterboxing trunk stable flag in... 

Merge "Create a new safe region letterboxing trunk stable flag in aaos_core_contrib namespace" into main
parents fa836f6a f4dec83b

core/java/android/view/WindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1542,7 +1542,7 @@ public interface WindowManager extends ViewManager { 
     * </pre>

     * @hide

     */

    @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING)

    @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING_V1)

    String PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING =

            "android.window.PROPERTY_COMPAT_ALLOW_SAFE_REGION_LETTERBOXING";

core/java/android/window/WindowContainerTransaction.java

+2 −2
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ public final class WindowContainerTransaction implements Parcelable { 
     * @hide

     */

    @NonNull

    @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING)

    @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING_V1)

    public WindowContainerTransaction setSafeRegionBounds(

            @NonNull WindowContainerToken container,

            @Nullable Rect safeRegionBounds) {
@@ -2207,7 +2207,7 @@ public final class WindowContainerTransaction implements Parcelable { 


        /** Creates a hierarchy op for setting the safe region bounds. */

        @NonNull

        @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING)

        @FlaggedApi(Flags.FLAG_SAFE_REGION_LETTERBOXING_V1)

        public static HierarchyOp createForSetSafeRegionBounds(@NonNull IBinder container,

                @Nullable Rect safeRegionBounds) {

            return new Builder(HIERARCHY_OP_TYPE_SET_SAFE_REGION_BOUNDS)

core/java/android/window/flags/windowing_sdk.aconfig

+2 −2
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ flag { 


flag {

    namespace: "aaos_core_contrib"

    name: "safe_region_letterboxing"

    name: "safe_region_letterboxing_v1"

    description: "Enables letterboxing for a safe region"

    bug: "380132497"

    bug: "425949809"

}



flag {

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

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
     *                         WindowContainer

     */

    void setSafeRegionBounds(@Nullable Rect safeRegionBounds) {

        if (!Flags.safeRegionLetterboxing()) {

        if (!Flags.safeRegionLetterboxingV1()) {

            Slog.i(TAG, "Feature safe region letterboxing is not available");

            return;

        }

services/tests/wmtests/src/com/android/server/wm/AppCompatSafeRegionPolicyTests.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import java.util.function.Consumer; 
 */

@Presubmit

@RunWith(WindowTestRunner.class)

@EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING)

@EnableFlags(Flags.FLAG_SAFE_REGION_LETTERBOXING_V1)

public class AppCompatSafeRegionPolicyTests extends WindowTestsBase {



    @Test