Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f7bdc12 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up usages of flag remove_qs_tooltip_in_suw" into main

parents 8802d4c0 dd915a50

src/com/android/settings/accessibility/PreviewSizeSeekBarController.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

+1 −3
Original line number Diff line number Diff line
@@ -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;

        }

tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java

+0 −7
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ import android.app.Activity; 
import android.content.ComponentName;

import android.content.Intent;

import android.os.Bundle;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.view.LayoutInflater;

import android.widget.PopupWindow;

import android.widget.SeekBar;
@@ -72,9 +69,6 @@ import org.robolectric.shadows.ShadowLooper; 
@Config(shadows = {ShadowInteractionJankMonitor.class})

public class PreviewSizeSeekBarControllerTest {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    @Rule

    public ActivityScenarioRule<EmptyFragmentActivity> rule =

            new ActivityScenarioRule<>(EmptyFragmentActivity.class);
@@ -213,7 +207,6 @@ public class PreviewSizeSeekBarControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_REMOVE_QS_TOOLTIP_IN_SUW)

    public void onProgressChanged_inSuw_toolTipShouldNotShown() {

        Intent intent = mContext.getIntent();

        intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);

tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java

+0 −1
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ public class ToggleFeaturePreferenceFragmentTest { 
    }



    @Test

    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_REMOVE_QS_TOOLTIP_IN_SUW)

    @Config(shadows = ShadowFragment.class)

    public void onPreferenceToggledOnEnabledService_inSuw_toolTipViewShouldNotShow() {

        Intent suwIntent = new Intent();