From dad011f5ba038989de998cde8366c1de01942f16 Mon Sep 17 00:00:00 2001 From: Candice Lo Date: Tue, 16 May 2023 02:44:39 +0000 Subject: [PATCH] Cleaning up Font Size QS tile tooltip Cleaning up Font Size QS tile tooltip in the Settings page in onDestroy to avoid leaking the window. Bug: 279547549 Bug: 279549685 Test: manually check only one tooltip exist Change-Id: Icafa2109af316989330bda5ed831c2f746e7968b --- .../settings/accessibility/PreviewSizeSeekBarController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java b/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java index 4c860eb3519..9603739ee6b 100644 --- a/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java +++ b/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java @@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.widget.LabeledSeekBarPreference; -import com.android.settings.widget.SeekBarPreference; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnDestroy; @@ -111,6 +110,10 @@ abstract class PreviewSizeSeekBarController extends BasePreferenceController imp public void onDestroy() { // remove runnables in the queue. mHandler.removeCallbacksAndMessages(null); + final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing(); + if (isTooltipWindowShowing) { + mTooltipWindow.dismiss(); + } } @Override