commit 279e2cbd087e8e0640c5e2d1b221ecd3b9803b9f
author Jagrut Desai <jagrutdesai@google.com> Wed Sep 06 23:18:13 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 06 23:18:13 2023 +0000
tree 679b2f1d774e04ef0f0b481bdb551dc6eef1eb4f
parent f89d65d9ccef718be83f7385a75eabf367222661
parent cd667ed4adf5f6f82ccfe5818e497047cc56694b

Merge "Clear TaskbarDividerPopupView callback upon closing" into main

quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt
index e215bc9..b200858 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt
@@ -59,6 +59,7 @@
             return taskMenuViewWithArrow.populateForView(view)
         }
     }
+
     private lateinit var dividerView: View
 
     private val menuWidth =
@@ -178,13 +179,19 @@
 
     override fun closeComplete() {
         onCloseCallback(didPreferenceChange)
+        onCloseCallback = {}
         super.closeComplete()
     }
 
     private fun onClickAlwaysShowTaskbarSwitchOption() {
         didPreferenceChange = true
         changePreference()
+        changePreference = {}
         // Allow switch animation to finish and then close the popup.
-        postDelayed(DIVIDER_POPUP_CLOSING_DELAY) { close(true) }
+        postDelayed(DIVIDER_POPUP_CLOSING_DELAY) {
+            if (isOpen) {
+                close(false)
+            }
+        }
     }
 }