Don't show quick settings tooltip if the user is in the Setup Wizard,
since the user can't access the Quick Settings Panel. Bug: 294560581 Test: manual - Turn on feature flag: adb shell device_config put accessibility com.android.settings.accessibility.remove_qs_tooltip_in_suw true - Modify the font scale in SUW, verify the QS tooltip doesn't show up - Modify the font scale after SUW, verify the QS tooltip shows up Test: atest SettingsRoboTests:com.android.settings.accessibility Change-Id: I1d1a4f8f70ea3e1d929952d5c273de1b4cd80503
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
@@ -33,6 +34,8 @@ import com.android.settingslib.core.lifecycle.events.OnCreate;
|
||||
import com.android.settingslib.core.lifecycle.events.OnDestroy;
|
||||
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
|
||||
|
||||
import com.google.android.setupcompat.util.WizardManagerHelper;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
/**
|
||||
@@ -207,6 +210,13 @@ abstract class PreviewSizeSeekBarController extends BasePreferenceController imp
|
||||
return;
|
||||
}
|
||||
|
||||
if (Flags.removeQsTooltipInSuw()
|
||||
&& mContext instanceof Activity
|
||||
&& WizardManagerHelper.isAnySetupWizard(((Activity) mContext).getIntent())) {
|
||||
// Don't show QuickSettingsTooltip in Setup Wizard
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mNeedsQSTooltipReshow && AccessibilityQuickSettingUtils.hasValueInSharedPreferences(
|
||||
mContext, tileComponentName)) {
|
||||
// Returns if quick settings tooltip only show once.
|
||||
|
@@ -905,6 +905,14 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
|
||||
return;
|
||||
}
|
||||
|
||||
Activity activity = getActivity();
|
||||
if (com.android.settings.accessibility.Flags.removeQsTooltipInSuw()
|
||||
&& activity != null
|
||||
&& WizardManagerHelper.isAnySetupWizard(activity.getIntent())) {
|
||||
// Don't show QuickSettingsTooltip in Setup Wizard
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mNeedsQSTooltipReshow && AccessibilityQuickSettingUtils.hasValueInSharedPreferences(
|
||||
getContext(), tileComponentName)) {
|
||||
// Returns if quick settings tooltip only show once.
|
||||
|
Reference in New Issue
Block a user