Merge "Remove enabled flag use_tasks_dim_only" into main (f3c83c5f) · Commits · e / os / android_frameworks_base

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -208,17 +208,6 @@ flag {
		}
		}

		flag {
		name: "use_tasks_dim_only"
		namespace: "windowing_frontend"
		description: "Only use the task's dim and reparent it to the display area when needed instead of coordinating multiple dimmers"
		bug: "352522056"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "update_dims_when_window_shown"
		namespace: "windowing_frontend"

+1 −12

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.view.SurfaceControl;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.protolog.ProtoLog;
		import com.android.window.flags.Flags;


		/**
		@@ -90,12 +89,6 @@ class Dimmer {
		}
		}

		void adjustSurfaceLayout(@NonNull SurfaceControl.Transaction t) {
		// TODO: Once we use geometry from hierarchy this falls away.
		t.setPosition(mDimSurface, mDimBounds.left, mDimBounds.top);
		t.setWindowCrop(mDimSurface, mDimBounds.width(), mDimBounds.height());
		}

		/**
		* Set the parameters to prepare the dim to change its appearance
		*/
		@@ -166,8 +159,7 @@ class Dimmer {
		* Whether anyone is currently requesting the dim
		*/
		boolean isDimming() {
		return mLastDimmingWindow != null
		&& (mHostContainer.isVisibleRequested() \|\| !Flags.useTasksDimOnly());
		return mLastDimmingWindow != null && mHostContainer.isVisibleRequested();
		}

		@NonNull
		@@ -275,9 +267,6 @@ class Dimmer {
		return false;
		} else {
		// Someone is dimming, show the requested changes
		if (!Flags.useTasksDimOnly()) {
		mDimState.adjustSurfaceLayout(t);
		}
		if (!mDimState.mIsVisible && mDimState.mLastDimmingWindow != null
		&& mDimState.mLastDimmingWindow.mActivityRecord != null
		&& mDimState.mLastDimmingWindow.mActivityRecord.mStartingData != null) {

+1 −4

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.util.proto.ProtoOutputStream;
		import android.view.SurfaceControl;

		import com.android.internal.protolog.ProtoLog;
		import com.android.window.flags.Flags;

		import java.io.PrintWriter;

		@@ -170,9 +169,7 @@ public class DimmerAnimationHelper {
		? mRequestedProperties.mGeometryParent.getSurfaceControl() : null,
		mRequestedProperties.mDimmingContainer != startProperties.mDimmingContainer
		? mRequestedProperties.mDimmingContainer.getSurfaceControl() : null, t);
		if (Flags.useTasksDimOnly()) {
		setBounds(dim, mCurrentProperties.mDimmingContainer, t);
		}

		if (!startProperties.hasSameVisualProperties(mRequestedProperties)) {
		EventLogTags.writeWmDimCancelAnim(dim.mDimSurface.getLayerId(), "new target values");

+0 −10

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import android.window.IDisplayAreaOrganizer;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.protolog.ProtoLog;
		import com.android.server.policy.WindowManagerPolicy;
		import com.android.window.flags.Flags;

		import java.io.PrintWriter;
		import java.util.Comparator;
		@@ -827,15 +826,6 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
		void prepareSurfaces() {
		mDimmer.resetDimStates();
		super.prepareSurfaces();
		Rect dimBounds = null;
		if (!Flags.useTasksDimOnly()) {
		dimBounds = mDimmer.getDimBounds();
		if (dimBounds != null) {
		// Bounds need to be relative, as the dim layer is a child.
		getBounds(dimBounds);
		dimBounds.offsetTo(0 /* newLeft /, 0 / newTop */);
		}
		}

		if (mDimmer.hasDimState()) {
		if (mDimmer.updateDims(getSyncTransaction())) {

+1 −19

Original line number	Diff line number	Diff line
		@@ -3343,25 +3343,7 @@ class Task extends TaskFragment {
		mDimmer.resetDimStates();
		super.prepareSurfaces();

		Rect dimBounds = null;
		if (!Flags.useTasksDimOnly()) {
		dimBounds = mDimmer.getDimBounds();
		if (dimBounds != null) {
		getDimBounds(dimBounds);

		// Bounds need to be relative, as the dim layer is a child.
		if (inFreeformWindowingMode()) {
		getBounds(mTmpRect);
		dimBounds.offset(-mTmpRect.left, -mTmpRect.top);
		} else {
		dimBounds.offsetTo(0, 0);
		}
		}
		}

		final SurfaceControl.Transaction t = getSyncTransaction();

		if (mDimmer.hasDimState() && mDimmer.updateDims(t)) {
		if (mDimmer.hasDimState() && mDimmer.updateDims(getSyncTransaction())) {
		scheduleAnimation();
		}
		}