Merge "Get dim bounds after super.prepareSurfaces" into udc-dev (1437e155) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/Dimmer.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -263,16 +263,19 @@ class Dimmer {
		* {@link WindowContainer#prepareSurfaces}. After calling this, the container should
		* chain {@link WindowContainer#prepareSurfaces} down to it's children to give them
		* a chance to request dims to continue.
		* @return Non-null dim bounds if the dimmer is showing.
		*/
		Rect resetDimStates() {
		void resetDimStates() {
		if (mDimState == null) {
		return null;
		return;
		}
		if (!mDimState.mDontReset) {
		mDimState.mDimming = false;
		}
		return mDimState.mDimBounds;
		}

		/** Returns non-null bounds if the dimmer is showing. */
		Rect getDimBounds() {
		return mDimState != null ? mDimState.mDimBounds : null;
		}

		void dontAnimateExit() {

+2 −1

Original line number	Diff line number	Diff line
		@@ -779,8 +779,9 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {

		@Override
		void prepareSurfaces() {
		final Rect dimBounds = mDimmer.resetDimStates();
		mDimmer.resetDimStates();
		super.prepareSurfaces();
		final Rect dimBounds = mDimmer.getDimBounds();
		if (dimBounds != null) {
		// Bounds need to be relative, as the dim layer is a child.
		getBounds(dimBounds);

+2 −1

Original line number	Diff line number	Diff line
		@@ -3252,9 +3252,10 @@ class Task extends TaskFragment {

		@Override
		void prepareSurfaces() {
		final Rect dimBounds = mDimmer.resetDimStates();
		mDimmer.resetDimStates();
		super.prepareSurfaces();

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2923,9 +2923,10 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		return;
		}

		final Rect dimBounds = mDimmer.resetDimStates();
		mDimmer.resetDimStates();
		super.prepareSurfaces();

		final Rect dimBounds = mDimmer.getDimBounds();
		if (dimBounds != null) {
		// Bounds need to be relative, as the dim layer is a child.
		dimBounds.offsetTo(0 /* newLeft /, 0 / newTop */);