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

Merge "Skip setting surface start state of non app window" into tm-qpr-dev am: fe4355e71c am: 556b967007

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20409607

Change-Id: Ia7a992013f2254983d0c77497e8c96b24ef70950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-11-10 02:54:45 +00:00
committed by Automerger Merge Worker
parent 13f0ffc61f 556b967007
commit 0270db12ea
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
View File

@@ -24,7 +24,6 @@ import static android.view.WindowManager.TRANSIT_OPEN;
import static android.view.WindowManager.TRANSIT_TO_BACK;
import static android.view.WindowManager.TRANSIT_TO_FRONT;
import static android.view.WindowManager.fixScale;
import static android.window.TransitionInfo.FLAG_IS_INPUT_METHOD;
import static android.window.TransitionInfo.FLAG_IS_OCCLUDED;
import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;
import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;
@@ -336,9 +335,12 @@ public class Transitions implements RemoteCallable<Transitions> {
boolean isOpening = isOpeningType(info.getType());
for (int i = info.getChanges().size() - 1; i >= 0; --i) {
final TransitionInfo.Change change = info.getChanges().get(i);
if ((change.getFlags() & TransitionInfo.FLAG_IS_SYSTEM_WINDOW) != 0) {
if (change.hasFlags(TransitionInfo.FLAGS_IS_NON_APP_WINDOW)) {
// Currently system windows are controlled by WindowState, so don't change their
// surfaces. Otherwise their window tokens could be hidden unexpectedly.
// surfaces. Otherwise their surfaces could be hidden or cropped unexpectedly.
// This includes Wallpaper (always z-ordered at bottom) and IME (associated with
// app), because there may not be a transition associated with their visibility
// changes, and currently they don't need transition animation.
continue;
}
final SurfaceControl leash = change.getLeash();
@@ -375,16 +377,7 @@ public class Transitions implements RemoteCallable<Transitions> {
finishT.setAlpha(leash, 1.f);
}
} else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) {
// Wallpaper/IME are anomalies: their visibility is tied to other WindowStates.
// As a result, we actually can't hide their WindowTokens because there may not be a
// transition associated with them becoming visible again. Fortunately, since
// wallpapers are always z-ordered to the back, we don't have to worry about it
// flickering to the front during reparenting. Similarly, the IME is reparented to
// the associated app, so its visibility is coupled. So, an explicit hide is not
// needed visually anyways.
if ((change.getFlags() & (FLAG_IS_WALLPAPER | FLAG_IS_INPUT_METHOD)) == 0) {
finishT.hide(leash);
}
finishT.hide(leash);
}
}
}