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

Commit 40354841 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Clean up the feature flag of the edge to edge enforcement" into main

parents 6e5ba71b ad16cedf

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

+0 −7
Original line number Diff line number Diff line
@@ -51,13 +51,6 @@ flag { 
  }

}



flag {

  name: "edge_to_edge_by_default"

  namespace: "windowing_frontend"

  description: "Make app go edge-to-edge by default when targeting SDK 35 or greater"

  bug: "309578419"

}



flag {

  name: "enforce_edge_to_edge"

  is_exported: true

core/java/com/android/internal/policy/PhoneWindow.java

+2 −2
Original line number Diff line number Diff line
@@ -461,11 +461,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            TypedArray windowStyle) {

        return !isOptingOutEdgeToEdgeEnforcement(info, local, windowStyle)

                && (info.targetSdkVersion >= ENFORCE_EDGE_TO_EDGE_SDK_VERSION

                        || (Flags.enforceEdgeToEdge() && (local

                        || (local

                                // Calling this doesn't require a permission.

                                ? CompatChanges.isChangeEnabled(ENFORCE_EDGE_TO_EDGE)

                                // Calling this requires permissions.

                                : info.isChangeEnabled(ENFORCE_EDGE_TO_EDGE))));

                                : info.isChangeEnabled(ENFORCE_EDGE_TO_EDGE)));

    }



    /**