From dad011f5ba038989de998cde8366c1de01942f16 Mon Sep 17 00:00:00 2001 From: Candice Lo Date: Tue, 16 May 2023 02:44:39 +0000 Subject: [PATCH 1/3] 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 From cb92ae1096ebb8a5251245dd771bc03c44ee88d9 Mon Sep 17 00:00:00 2001 From: Candice Lo Date: Tue, 16 May 2023 03:36:00 +0000 Subject: [PATCH 2/3] Cleaning up tooltip for AccessibilityQuickSettingsPrimarySwitchPreferenceController 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: I13e94ce549e19fd54c9034f3b3372ecf40388e39 --- ...ibilityQuickSettingsPrimarySwitchPreferenceController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java index 9681a42ad0a..47073638122 100644 --- a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java +++ b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java @@ -66,6 +66,10 @@ public abstract class AccessibilityQuickSettingsPrimarySwitchPreferenceControlle @Override public void onDestroy() { mHandler.removeCallbacksAndMessages(null); + final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing(); + if (isTooltipWindowShowing) { + mTooltipWindow.dismiss(); + } } @Override From 3dab6548b9bca1db34baff7289ff1ef751d293c7 Mon Sep 17 00:00:00 2001 From: Candice Lo Date: Tue, 16 May 2023 06:27:44 +0000 Subject: [PATCH 3/3] 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