PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I781cdba1,I13e94ce5,Icafa2109 into udc-qpr-dev

Browse Source 
* changes:
  Cleaning up tooltip for ToggleFeaturePreferenceFragment
  Cleaning up tooltip for AccessibilityQuickSettingsPrimarySwitchPreferenceController
  Cleaning up Font Size QS tile tooltip
This commit is contained in:
Candice Lo
2023-05-16 08:44:49 +00:00
committed by Android (Google) Code Review
parent 631c72f7d4 3dab6548b9
commit ca7c7a2a50
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
View File

@@ -66,6 +66,10 @@ public abstract class AccessibilityQuickSettingsPrimarySwitchPreferenceControlle
@Override @Override
public void onDestroy() { public void onDestroy() {
mHandler.removeCallbacksAndMessages(null); mHandler.removeCallbacksAndMessages(null);
final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
if (isTooltipWindowShowing) {
mTooltipWindow.dismiss();
}
} }
@Override @Override

5
src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
View File

@@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.LabeledSeekBarPreference; 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.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnCreate;
import com.android.settingslib.core.lifecycle.events.OnDestroy; import com.android.settingslib.core.lifecycle.events.OnDestroy;
@@ -111,6 +110,10 @@ abstract class PreviewSizeSeekBarController extends BasePreferenceController imp
public void onDestroy() { public void onDestroy() {
// remove runnables in the queue. // remove runnables in the queue.
mHandler.removeCallbacksAndMessages(null); mHandler.removeCallbacksAndMessages(null);
final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
if (isTooltipWindowShowing) {
mTooltipWindow.dismiss();
}
} }
@Override @Override

4
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -296,6 +296,10 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
removeActionBarToggleSwitch(); removeActionBarToggleSwitch();
final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
if (isTooltipWindowShowing) {
mTooltipWindow.dismiss();
}
} }
@Override @Override