[Predictive Back] Update SearchView and NavigationView to unregister …

…back callbacks when detached from window Resolves #4176 PiperOrigin-RevId: 633969673
material-components · May 15, 2024 · d13bfdf · grahammendick · May 15, 2024 · d13bfdf
1 parent a89e38c
commit d13bfdf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/lib/java/com/google/android/material/motion/MaterialBackOrchestrator.java b/lib/java/com/google/android/material/motion/MaterialBackOrchestrator.java
@@ -186,6 +186,9 @@ public void startListeningForBackCallbacks(
     @DoNotInline
     @Override
     public void stopListeningForBackCallbacks(@NonNull View view) {
+      if (onBackInvokedCallback == null) {
+        return;
+      }
       OnBackInvokedDispatcher onBackInvokedDispatcher = view.findOnBackInvokedDispatcher();
       if (onBackInvokedDispatcher == null) {
         return;

diff --git a/lib/java/com/google/android/material/navigation/NavigationView.java b/lib/java/com/google/android/material/navigation/NavigationView.java
@@ -476,6 +476,8 @@ protected void onDetachedFromWindow() {
       DrawerLayout drawerLayout = (DrawerLayout) parent;
       drawerLayout.removeDrawerListener(backDrawerListener);
     }
+
+    backOrchestrator.stopListeningForBackCallbacks();
   }
 
   @Override

diff --git a/lib/java/com/google/android/material/search/SearchView.java b/lib/java/com/google/android/material/search/SearchView.java
@@ -265,6 +265,13 @@ protected void onAttachedToWindow() {
     MaterialShapeUtils.setParentAbsoluteElevation(this);
   }
 
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+
+    backOrchestrator.stopListeningForBackCallbacks();
+  }
+
   @Override
   @NonNull
   public CoordinatorLayout.Behavior<SearchView> getBehavior() {