Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up usages of flag remove_qs_tooltip_in_suw" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-04-01 21:33:42 +00:00
committed by Android (Google) Code Review
parent 8802d4c085 dd915a5031
commit 4f7bdc12c3
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,8 +210,7 @@ abstract class PreviewSizeSeekBarController extends BasePreferenceController imp
return;
}
if (Flags.removeQsTooltipInSuw()
&& mContext instanceof Activity
if (mContext instanceof Activity
&& WizardManagerHelper.isAnySetupWizard(((Activity) mContext).getIntent())) {
// Don't show QuickSettingsTooltip in Setup Wizard
return;

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

@@ -931,9 +931,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
}
Activity activity = getActivity();
if (com.android.settings.accessibility.Flags.removeQsTooltipInSuw()
&& activity != null
&& WizardManagerHelper.isAnySetupWizard(activity.getIntent())) {
if (activity != null && WizardManagerHelper.isAnySetupWizard(activity.getIntent())) {
// Don't show QuickSettingsTooltip in Setup Wizard
return;
}