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

Commit 2f67e237 authored Sep 11, 2014 by Svetoslav Committed by Android (Google) Code Review Sep 11, 2014

Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev

parents e14a29ff b180d770

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -568,6 +568,15 @@ public class WindowAnimator {
	mBulkUpdateParams \|= SET_UPDATE_ROTATION;		mBulkUpdateParams \|= SET_UPDATE_ROTATION;
	screenRotationAnimation.kill();		screenRotationAnimation.kill();
	displayAnimator.mScreenRotationAnimation = null;		displayAnimator.mScreenRotationAnimation = null;

			//TODO (multidisplay): Accessibility supported only for the default display.
			if (mService.mAccessibilityController != null
			&& displayId == Display.DEFAULT_DISPLAY) {
			// We just finished rotation animation which means we did not
			// anounce the rotation and waited for it to end, announce now.
			mService.mAccessibilityController.onRotationChangedLocked(
			mService.getDefaultDisplayContentLocked(), mService.mRotation);
			}
	}		}
	}		}

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

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6442,9 +6442,12 @@ public class WindowManagerService extends IWindowManager.Stub
	}		}

	//TODO (multidisplay): Magnification is supported only for the default display.		//TODO (multidisplay): Magnification is supported only for the default display.
	if (mAccessibilityController != null		// Announce rotation only if we will not animate as we already have the
			// windows in final state. Otherwise, we make this call at the rotation end.
			if (screenRotationAnimation == null && mAccessibilityController != null
	&& displayContent.getDisplayId() == Display.DEFAULT_DISPLAY) {		&& displayContent.getDisplayId() == Display.DEFAULT_DISPLAY) {
	mAccessibilityController.onRotationChangedLocked(getDefaultDisplayContentLocked(), rotation);		mAccessibilityController.onRotationChangedLocked(getDefaultDisplayContentLocked(),
			rotation);
	}		}

	return true;		return true;