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

Merge "Don't show quick settings tooltip if the user is in the Setup Wizard, since the user can't access the Quick Settings Panel." into main

Browse Source
This commit is contained in:
Chun-Ku Lin
2023-11-16 03:03:57 +00:00
committed by Android (Google) Code Review
parent 3185a36b90 0f2cc34230
commit e0852d25f7
9 changed files with 100 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.

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

@@ -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.