From 3dab6548b9bca1db34baff7289ff1ef751d293c7 Mon Sep 17 00:00:00 2001 From: Candice Lo Date: Tue, 16 May 2023 06:27:44 +0000 Subject: [PATCH] Cleaning up tooltip for ToggleFeaturePreferenceFragment Cleaning up QS tile tooltip in the Settings page in onDestroy to avoid leaking the window. Bug: 279547549 Test: manually check only one tooltip exists Change-Id: I781cdba1be7be0315de12cd57620521b40969aee --- .../accessibility/ToggleFeaturePreferenceFragment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index edbd120e698..6a4344ff0d2 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -296,6 +296,10 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment public void onDestroyView() { super.onDestroyView(); removeActionBarToggleSwitch(); + final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing(); + if (isTooltipWindowShowing) { + mTooltipWindow.dismiss(); + } } @Override