Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Notify Accessibilty about rotation in applyRotation" into rvc-dev

Browse Source
This commit is contained in:
Chavi Weingarten
2020-05-08 16:00:10 +00:00
committed by Android (Google) Code Review
parent 0bb978de88 afc54cf30f
commit 1edeeee316
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1620,9 +1620,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
} }
} }
// Announce rotation only if we will not animate as we already have the if (mWmService.mAccessibilityController != null) {
// windows in final state. Otherwise, we make this call at the rotation end.
if (screenRotationAnimation == null && mWmService.mAccessibilityController != null) {
mWmService.mAccessibilityController.onRotationChangedLocked(this); mWmService.mAccessibilityController.onRotationChangedLocked(this);
} }
} }

7
services/core/java/com/android/server/wm/ScreenRotationAnimation.java
View File

@@ -732,13 +732,6 @@ class ScreenRotationAnimation {
mService.mAnimator.mBulkUpdateParams |= WindowSurfacePlacer.SET_UPDATE_ROTATION; mService.mAnimator.mBulkUpdateParams |= WindowSurfacePlacer.SET_UPDATE_ROTATION;
kill(); kill();
mService.updateRotation(false, false); mService.updateRotation(false, false);
AccessibilityController accessibilityController = mService.mAccessibilityController;
if (accessibilityController != null) {
// We just finished rotation animation which means we did not
// announce the rotation and waited for it to end, announce now.
accessibilityController.onRotationChangedLocked(mDisplayContent);
}
} }
} }