Fix conflicts

This commit is contained in:
MrSluffy
2024-01-08 15:24:23 +08:00
committed by Goooler
parent 3269857e66
commit 32922a2e02
25 changed files with 39 additions and 358 deletions
@@ -173,12 +173,6 @@ public class DepthController extends BaseDepthController implements StateHandler
mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener);
}
@Override
protected void onInvalidSurface() {
// Lets wait for surface to become valid again
mLauncher.getDragLayer().getViewTreeObserver().addOnDrawListener(mOnDrawListener);
}
@Override
public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
mIgnoreStateChangesDuringMultiWindowAnimation = true;