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

Merge "Apply rotation animation when canceling fixed rotation" into sc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-05-04 11:53:30 +00:00
committed by Android (Google) Code Review
parent 3476ed1d68 cf951a0276
commit 25a8b5f625
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -6619,9 +6619,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
@Override
void onCancelFixedRotationTransform(int originalDisplayRotation) {
if (this != mDisplayContent.getLastOrientationSource()
|| getRequestedConfigurationOrientation() != ORIENTATION_UNDEFINED) {
// Only need to handle the activity that should be rotated with display.
if (this != mDisplayContent.getLastOrientationSource()) {
// This activity doesn't affect display rotation.
return;
}
final int requestedOrientation = getRequestedConfigurationOrientation();
if (requestedOrientation != ORIENTATION_UNDEFINED
&& requestedOrientation != mDisplayContent.getConfiguration().orientation) {
// Only need to handle the activity that can be rotated with display or the activity
// has requested the same orientation.
return;
}

9
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
View File

@@ -1723,6 +1723,15 @@ public class ActivityRecordTests extends WindowTestsBase {
assertFalse(display.hasTopFixedRotationLaunchingApp());
assertFalse(activity.hasFixedRotationTransform());
// Simulate that the activity requests the same orientation as display.
activity.setOrientation(display.getConfiguration().orientation);
// Skip the real freezing.
activity.mVisibleRequested = false;
clearInvocations(activity);
activity.onCancelFixedRotationTransform(originalRotation);
// The implementation of cancellation must be executed.
verify(activity).startFreezingScreen(originalRotation);
}
@Test