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

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

Merge "Cleanup: remove movable cutout feature flag" into main

parents 3824e87d 846e1985

core/java/android/view/DisplayCutout.java

+2 −6
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package android.view;



import static android.content.res.Resources.ID_NULL;

import static android.util.DisplayMetrics.DENSITY_DEFAULT;

import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;

import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.BOUND_BOTTOM;

import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.BOUND_LEFT;

import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.BOUND_RIGHT;
@@ -26,6 +24,8 @@ import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto. 
import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.INSETS;

import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.SIDE_OVERRIDES;

import static android.internal.perfetto.protos.Displaycutout.DisplayCutoutProto.WATERFALL_INSETS;

import static android.util.DisplayMetrics.DENSITY_DEFAULT;

import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;

import static android.view.Surface.ROTATION_0;

import static android.view.Surface.ROTATION_270;
@@ -52,7 +52,6 @@ import android.view.Surface.Rotation; 
import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.window.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -1149,9 +1148,6 @@ public final class DisplayCutout { 


    private static int[] getDisplayCutoutSideOverrides(Resources res, String displayUniqueId)

            throws IllegalArgumentException {

        if (!Flags.movableCutoutConfiguration()) {

            return null;

        }

        final int index = DisplayUtils.getDisplayUniqueIdConfigIndex(res, displayUniqueId);

        final TypedArray array = res.obtainTypedArray(

                R.array.config_displayCutoutSideOverrideArray);

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

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ flag { 
  }

}



flag {

  name: "movable_cutout_configuration"

  namespace: "large_screen_experiences_app_compat"

  description: "Make it possible to move cutout across edges through device config"

  bug: "302387383"

  is_fixed_read_only: true

}



flag {

  name: "density_390_api"

  is_exported: true