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

Merge "Remove previous workaround for setColorMode to WCG" into udc-qpr-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2023-08-10 05:29:47 +00:00
committed by Android (Google) Code Review
parent bb87028ac3 f1318a7a55
commit 50191e74fa
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,6 @@ import static android.os.Build.VERSION_CODES.O;
import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS;
import static android.os.Process.SYSTEM_UID;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
import static android.view.Display.COLOR_MODE_DEFAULT;
import static android.view.Display.INVALID_DISPLAY;
import static android.view.Surface.ROTATION_270;
import static android.view.Surface.ROTATION_90;
@@ -4691,26 +4690,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
}
/**
* @return Whether we are allowed to show non-starting windows at the moment. We disallow
* showing windows while the transition animation is playing in case we have windows
* that have wide-color-gamut color mode set to avoid jank in the middle of the
* animation.
* @return Whether we are allowed to show non-starting windows at the moment.
*/
boolean canShowWindows() {
final boolean drawn = mTransitionController.isShellTransitionsEnabled()
return mTransitionController.isShellTransitionsEnabled()
? mSyncState != SYNC_STATE_WAITING_FOR_DRAW : allDrawn;
final boolean animating = mTransitionController.isShellTransitionsEnabled()
? mTransitionController.inPlayingTransition(this)
: isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION);
return drawn && !(animating && hasNonDefaultColorWindow());
}
/**
* @return true if we have a window that has a non-default color mode set; false otherwise.
*/
private boolean hasNonDefaultColorWindow() {
return forAllWindows(ws -> ws.mAttrs.getColorMode() != COLOR_MODE_DEFAULT,
true /* topToBottom */);
}
@Override