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

Commit 12d638dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up the feature flag of disable_opt_out_edge_to_edge" into main

parents d5f3da8f 260b20c8

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

+0 −8
Original line number Diff line number Diff line
@@ -49,14 +49,6 @@ flag { 
  is_fixed_read_only: true

}



flag {

  name: "disable_opt_out_edge_to_edge"

  namespace: "windowing_frontend"

  description: "Deprecate and disable windowOptOutEdgeToEdgeEnforcement"

  bug: "377864165"

  is_fixed_read_only: true

}



flag {

  name: "action_mode_edge_to_edge"

  namespace: "windowing_frontend"

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

+5 −7
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ import com.android.internal.view.menu.MenuHelper; 
import com.android.internal.view.menu.MenuPresenter;

import com.android.internal.view.menu.MenuView;

import com.android.internal.widget.DecorContentParent;

import com.android.window.flags.Flags;



import java.lang.ref.WeakReference;

import java.util.ArrayList;
@@ -473,12 +472,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
     * whether the app declares style to opt out.

     */

    public static boolean isOptOutEdgeToEdgeEnabled(ApplicationInfo info, boolean local) {

        final boolean disabled = Flags.disableOptOutEdgeToEdge()

                && (local

        final boolean disabled = local

                // Calling this doesn't require a permission.

                ? CompatChanges.isChangeEnabled(DISABLE_OPT_OUT_EDGE_TO_EDGE)

                // Calling this requires permissions.

                        : info.isChangeEnabled(DISABLE_OPT_OUT_EDGE_TO_EDGE));

                : info.isChangeEnabled(DISABLE_OPT_OUT_EDGE_TO_EDGE);

        return !disabled;

    }