From 9d387bb31027cf487a7a1adf38c4b21a8c7db9de Mon Sep 17 00:00:00 2001 From: MrSluffy Date: Tue, 17 Dec 2024 10:22:06 +0800 Subject: [PATCH] fixed NPE's below R when close folder --- src/com/android/launcher3/folder/Folder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 88211fede7..7495cdbcfb 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -910,14 +910,18 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo a.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { - setWindowInsetsAnimationCallback(null); + if (Utilities.ATLEAST_R) { + setWindowInsetsAnimationCallback(null); + } mIsAnimatingClosed = true; } @Override public void onAnimationEnd(Animator animation) { if (mKeyboardInsetAnimationCallback != null) { - setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback); + if (Utilities.ATLEAST_R) { + setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback); + } } closeComplete(true); announceAccessibilityChanges();