Merge "Prepare to remove getDimmer" into main (587b819d) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,16 @@ flag {
		}
		}

		flag {
		name: "remove_get_dimmer"
		namespace: "windowing_frontend"
		description: "Clean up old usages of dimmer"
		bug: "435301249"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "release_all_transition_surfaces"
		namespace: "windowing_frontend"

+3 −1

Original line number	Diff line number	Diff line
		@@ -811,12 +811,14 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
		* DisplayArea that can be dimmed.
		*/
		static class Dimmable extends DisplayArea<DisplayArea> {
		private final Dimmer mDimmer = new Dimmer(this);
		final Dimmer mDimmer = new Dimmer(this);

		Dimmable(WindowManagerService wms, Type type, String name, int featureId) {
		super(wms, type, name, featureId);
		}

		// It is replaced by WindowState#getDimController().
		@Deprecated
		@Override
		Dimmer getDimmer() {
		return mDimmer;

+1 −0

Original line number	Diff line number	Diff line
		@@ -3347,6 +3347,7 @@ class Task extends TaskFragment {
		return "Task=" + mTaskId + (mName != null ? "(" + mName + ")" : "");
		}

		// It is replaced by WindowState#getDimController().
		@Deprecated
		@Override
		Dimmer getDimmer() {

+16 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		*/
		int mMinHeight;

		Dimmer mDimmer = new Dimmer(this);
		final Dimmer mDimmer = new Dimmer(this);

		/** Apply the dim layer on the embedded TaskFragment. */
		static final int EMBEDDED_DIM_AREA_TASK_FRAGMENT = 0;
		@@ -3329,6 +3329,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		return forAllWindows(getDimBehindWindow, true);
		}

		// It is replaced by WindowState#getDimController().
		@Deprecated
		@Override
		Dimmer getDimmer() {
		@@ -3342,6 +3343,20 @@ class TaskFragment extends WindowContainer<WindowContainer> {

		/** Bounds to be used for dimming, as well as touch related tests. */
		void getDimBounds(@NonNull Rect out) {
		if (com.android.window.flags.Flags.removeGetDimmer()) {
		if (mIsEmbedded && isDimmingOnParentTask()) {
		// Return the task bounds if the dimmer is showing and should cover on the Task
		// (not just on this embedded TaskFragment).
		final Task task = getTask();
		if (task != null && task.mDimmer.hasDimState()) {
		out.set(task.getBounds());
		return;
		}
		}
		out.set(getBounds());
		return;
		}

		if (mDimmer.hasDimState()) {
		out.set(mDimmer.getDimBounds());
		} else {

+1 −0

Original line number	Diff line number	Diff line
		@@ -3239,6 +3239,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		}, true /* traverseTopToBottom */);
		}

		// It is replaced by WindowState#getDimController().
		@Deprecated
		Dimmer getDimmer() {
		if (mParent == null) {