From f337bf1fad459dfe708ef2cb81a8b9a3011c63f2 Mon Sep 17 00:00:00 2001 From: Riley Jones Date: Mon, 9 Dec 2024 19:02:26 +0000 Subject: [PATCH] Cleaning up deprecated QS tooltip code Flag is rolled out, so tooltips other than font size shouldn't show anymore. Much code can be removed. Flag: EXEMPT code cleanup Test: atest com.android.settings.accessibility Bug: 367414968 Change-Id: I55084982fee0d0537aade49d36f52e121e24574b --- .../AccessibilityHearingAidsFragment.java | 11 --- ...cessibilityShortcutPreferenceFragment.java | 69 ------------------ ...cessibilityActivityPreferenceFragment.java | 5 -- ...oggleColorInversionPreferenceFragment.java | 4 -- .../ToggleDaltonizerPreferenceFragment.java | 4 -- .../ToggleFeaturePreferenceFragment.java | 72 ++----------------- ...eReduceBrightColorsPreferenceFragment.java | 3 - .../settings/gestures/OneHandedSettings.java | 28 +------- ...ibilityShortcutPreferenceFragmentTest.java | 28 -------- .../ToggleFeaturePreferenceFragmentTest.java | 8 --- .../gestures/OneHandedSettingsTest.java | 18 ----- 11 files changed, 8 insertions(+), 242 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java index 09e2d97e48b..3bda864a105 100644 --- a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java @@ -96,17 +96,6 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe return mFeatureName; } - @Override - protected ComponentName getTileComponentName() { - return AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_TILE_COMPONENT_NAME; - } - - @Override - protected CharSequence getTileTooltipContent(int type) { - // No tooltip to be shown - return null; - } - @Override protected boolean showGeneralCategory() { // Have static preference under dynamically created PreferenceCategory KEY_GENERAL_CATEGORY. diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 23c3fd4ebb6..2a22902a196 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -20,10 +20,8 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh import static com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums; import static com.android.settings.accessibility.AccessibilityUtil.getShortcutSummaryList; import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_GENERAL_CATEGORY; -import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_QS_TOOLTIP_TYPE; import android.annotation.SuppressLint; -import android.app.Activity; import android.app.Dialog; import android.app.settings.SettingsEnums; import android.content.ComponentName; @@ -44,7 +42,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.accessibility.common.ShortcutConstants; import com.android.settings.R; -import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment; import com.android.settings.dashboard.RestrictedDashboardFragment; @@ -60,16 +57,12 @@ import java.util.Set; public abstract class AccessibilityShortcutPreferenceFragment extends RestrictedDashboardFragment implements ShortcutPreference.OnClickCallback { private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference"; - protected static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow"; protected ShortcutPreference mShortcutPreference; protected Dialog mDialog; private AccessibilityManager.TouchExplorationStateChangeListener mTouchExplorationStateChangeListener; private AccessibilitySettingsContentObserver mSettingsContentObserver; - private AccessibilityQuickSettingsTooltipWindow mTooltipWindow; - private boolean mNeedsQSTooltipReshow = false; - private int mNeedsQSTooltipType = QuickSettingsTooltipType.GUIDE_TO_EDIT; public AccessibilityShortcutPreferenceFragment(String restrictionKey) { super(restrictionKey); @@ -81,26 +74,10 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted /** Returns the accessibility feature name. */ protected abstract CharSequence getLabelName(); - /** Returns the accessibility tile component name. */ - protected abstract ComponentName getTileComponentName(); - - /** Returns the accessibility tile tooltip content. */ - protected abstract CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type); - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Restore the user shortcut type and tooltip. - if (savedInstanceState != null) { - if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_RESHOW)) { - mNeedsQSTooltipReshow = savedInstanceState.getBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW); - } - if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_TYPE)) { - mNeedsQSTooltipType = savedInstanceState.getInt(KEY_SAVED_QS_TOOLTIP_TYPE); - } - } - final int resId = getPreferenceScreenResId(); if (resId <= 0) { final PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen( @@ -141,21 +118,6 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted return super.onCreateView(inflater, container, savedInstanceState); } - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - // Reshow tooltip when activity recreate, such as rotate device. - if (mNeedsQSTooltipReshow) { - view.post(() -> { - final Activity activity = getActivity(); - if (activity != null && !activity.isFinishing()) { - showQuickSettingsTooltipIfNeeded(); - } - }); - } - } - @Override public void onResume() { super.onResume(); @@ -177,16 +139,6 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted super.onPause(); } - @Override - public void onSaveInstanceState(Bundle outState) { - final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing(); - if (mNeedsQSTooltipReshow || isTooltipWindowShowing) { - outState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true); - outState.putInt(KEY_SAVED_QS_TOOLTIP_TYPE, mNeedsQSTooltipType); - } - super.onSaveInstanceState(outState); - } - @Override public Dialog onCreateDialog(int dialogId) { switch (dialogId) { @@ -289,7 +241,6 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted */ private void callOnTutorialDialogButtonClicked(DialogInterface dialog, int which) { dialog.dismiss(); - showQuickSettingsTooltipIfNeeded(); } @VisibleForTesting @@ -362,26 +313,6 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext())); } - /** - * Shows the quick settings tooltip if the quick settings feature is assigned. The tooltip only - * shows once. - * - * @param type The quick settings tooltip type - */ - protected void showQuickSettingsTooltipIfNeeded(@QuickSettingsTooltipType int type) { - mNeedsQSTooltipType = type; - showQuickSettingsTooltipIfNeeded(); - } - - /** - * @deprecated made obsolete by quick settings rollout. - * - * (TODO 367414968: finish removal.) - */ - @Deprecated - private void showQuickSettingsTooltipIfNeeded() { - } - /** * Returns the user preferred shortcut types or the default shortcut types if not set */ diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java index e49078bbd71..f729cc7a2cc 100644 --- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java +++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java @@ -71,11 +71,6 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature return view; } - @Override - protected void onPreferenceToggled(String preferenceKey, boolean enabled) { - // Do nothing. - } - @Override protected void onProcessArguments(Bundle arguments) { super.onProcessArguments(arguments); diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java index e28622501ed..b779f9d2d6a 100644 --- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java @@ -107,10 +107,6 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere if (enabled == isEnabled) { return; } - - if (enabled) { - showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); - } logAccessibilityServiceEnabled(mComponentName, enabled); Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF); } diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 5b2df5aeb2f..fe51e69845b 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -158,10 +158,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF if (enabled == isEnabled) { return; } - - if (enabled) { - showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); - } logAccessibilityServiceEnabled(mComponentName, enabled); Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF); } diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 65a1cd4b532..49f22bf5994 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -21,7 +21,6 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh import static com.android.settings.accessibility.AccessibilityDialogUtils.DialogEnums; import static com.android.settings.accessibility.AccessibilityUtil.getShortcutSummaryList; -import android.app.Activity; import android.app.Dialog; import android.app.settings.SettingsEnums; import android.content.ComponentName; @@ -85,8 +84,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment public static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference"; protected static final String KEY_TOP_INTRO_PREFERENCE = "top_intro"; protected static final String KEY_HTML_DESCRIPTION_PREFERENCE = "html_description"; - protected static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow"; - protected static final String KEY_SAVED_QS_TOOLTIP_TYPE = "qs_tooltip_type"; protected static final String KEY_ANIMATED_IMAGE = "animated_image"; // For html description of accessibility service, must follow the rule, such as // , a11y settings will get the resources successfully. @@ -112,10 +109,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment private CharSequence mDescription; private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener; private AccessibilitySettingsContentObserver mSettingsContentObserver; - - private AccessibilityQuickSettingsTooltipWindow mTooltipWindow; - private boolean mNeedsQSTooltipReshow = false; - private int mNeedsQSTooltipType = QuickSettingsTooltipType.GUIDE_TO_EDIT; private ImageView mImageGetterCacheView; protected final Html.ImageGetter mImageGetter = (String str) -> { if (str != null && str.startsWith(IMG_PREFIX)) { @@ -133,16 +126,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment super.onCreate(savedInstanceState); onProcessArguments(getArguments()); - // Restore the user shortcut type and tooltip. - if (savedInstanceState != null) { - if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_RESHOW)) { - mNeedsQSTooltipReshow = savedInstanceState.getBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW); - } - if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_TYPE)) { - mNeedsQSTooltipType = savedInstanceState.getInt(KEY_SAVED_QS_TOOLTIP_TYPE); - } - } - final int resId = getPreferenceScreenResId(); if (resId <= 0) { final PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen( @@ -227,16 +210,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment final SettingsMainSwitchBar switchBar = settingsActivity.getSwitchBar(); switchBar.hide(); - // Reshow tooltip when activity recreate, such as rotate device. - if (mNeedsQSTooltipReshow) { - view.post(() -> { - final Activity activity = getActivity(); - if (activity != null && !activity.isFinishing()) { - showQuickSettingsTooltipIfNeeded(); - } - }); - } - writeConfigDefaultAccessibilityServiceIntoShortcutTargetServiceIfNeeded(getContext()); } @@ -261,24 +234,10 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment super.onPause(); } - @Override - public void onSaveInstanceState(Bundle outState) { - final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing(); - if (mNeedsQSTooltipReshow || isTooltipWindowShowing) { - outState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true); - outState.putInt(KEY_SAVED_QS_TOOLTIP_TYPE, mNeedsQSTooltipType); - } - super.onSaveInstanceState(outState); - } - @Override public void onDestroyView() { super.onDestroyView(); removeActionBarToggleSwitch(); - final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing(); - if (isTooltipWindowShowing) { - mTooltipWindow.dismiss(); - } } @Override @@ -314,7 +273,12 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment /** Returns the accessibility tile component name. */ abstract ComponentName getTileComponentName(); - /** Returns the accessibility tile tooltip content. */ + /** Returns the accessibility tile component name. + * + * @deprecated unused, as this class no longer displays tile tooltips. + * + * (TODO 367414968: finish removal.)*/ + @Deprecated abstract CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type); protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) { @@ -332,9 +296,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment } protected void onPreferenceToggled(String preferenceKey, boolean enabled) { - if (enabled) { - showQuickSettingsTooltipIfNeeded(); - } } protected void onInstallSwitchPreferenceToggleSwitch() { @@ -646,7 +607,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment */ private void callOnTutorialDialogButtonClicked(DialogInterface dialog, int which) { dialog.dismiss(); - showQuickSettingsTooltipIfNeeded(); } protected void updateShortcutPreferenceData() { @@ -737,26 +697,6 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment } } - /** - * Shows the quick settings tooltip if the quick settings feature is assigned. The tooltip only - * shows once. - * - * @param type The quick settings tooltip type - */ - protected void showQuickSettingsTooltipIfNeeded(@QuickSettingsTooltipType int type) { - mNeedsQSTooltipType = type; - showQuickSettingsTooltipIfNeeded(); - } - - /** - * @deprecated made obsolete by quick settings rollout. - * - * (TODO 367414968: finish removal.) - */ - @Deprecated - private void showQuickSettingsTooltipIfNeeded() { - } - /** Returns user visible name of the tile by given {@link ComponentName}. */ protected CharSequence loadTileLabel(Context context, ComponentName componentName) { final PackageManager packageManager = context.getPackageManager(); diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java index 16911f6abb8..ff14021108d 100644 --- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java @@ -149,9 +149,6 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre @Override protected void onPreferenceToggled(String preferenceKey, boolean enabled) { - if (enabled) { - showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); - } logAccessibilityServiceEnabled(mComponentName, enabled); mColorDisplayManager.setReduceBrightColorsActivated(enabled); } diff --git a/src/com/android/settings/gestures/OneHandedSettings.java b/src/com/android/settings/gestures/OneHandedSettings.java index 03788889e8b..0a2599e4650 100644 --- a/src/com/android/settings/gestures/OneHandedSettings.java +++ b/src/com/android/settings/gestures/OneHandedSettings.java @@ -22,9 +22,9 @@ import android.content.ComponentName; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; -import android.util.Log; import android.view.LayoutInflater; import android.view.ViewGroup; +import android.widget.CompoundButton; import androidx.recyclerview.widget.RecyclerView; @@ -33,7 +33,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.accessibility.AccessibilityFragmentUtils; import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment; -import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexableRaw; @@ -82,12 +81,7 @@ public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment { final MainSwitchPreference mainSwitchPreference = getPreferenceScreen().findPreference(ONE_HANDED_MAIN_SWITCH_KEY); - mainSwitchPreference.addOnSwitchChangeListener((switchView, isChecked) -> { - switchView.setChecked(isChecked); - if (isChecked) { - showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); - } - }); + mainSwitchPreference.addOnSwitchChangeListener(CompoundButton::setChecked); } @Override @@ -145,24 +139,6 @@ public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment { return mFeatureName; } - @Override - protected ComponentName getTileComponentName() { - return AccessibilityShortcutController.ONE_HANDED_TILE_COMPONENT_NAME; - } - - @Override - protected CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { - final Context context = getContext(); - if (context == null) { - Log.w(TAG, "OneHandedSettings not attached to a context."); - return null; - } - return type == QuickSettingsTooltipType.GUIDE_TO_EDIT - ? context.getText(R.string.accessibility_one_handed_mode_qs_tooltip_content) - : context.getText( - R.string.accessibility_one_handed_mode_auto_added_qs_tooltip_content); - } - @Override protected int getPreferenceScreenResId() { return R.xml.one_handed_settings; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java index 5973d265a92..552a4a71a71 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java @@ -19,7 +19,6 @@ package com.android.settings.accessibility; import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE; import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.QUICK_SETTINGS; import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE; -import static com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import static com.google.common.truth.Truth.assertThat; @@ -37,7 +36,6 @@ import android.content.Context; import android.content.Intent; import android.icu.text.CaseMap; import android.os.Bundle; -import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.view.LayoutInflater; import android.view.View; @@ -57,7 +55,6 @@ import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragm import com.android.settings.testutils.shadow.ShadowFragment; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -83,18 +80,11 @@ public class AccessibilityShortcutPreferenceFragmentTest { PLACEHOLDER_PACKAGE_NAME + "tile.placeholder"; private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName( PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME); - private static final ComponentName PLACEHOLDER_TILE_COMPONENT_NAME = new ComponentName( - PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME); - private static final String PLACEHOLDER_TILE_TOOLTIP_CONTENT = - PLACEHOLDER_PACKAGE_NAME + "tooltip_content"; - private static final String PLACEHOLDER_DIALOG_TITLE = "title"; private static final String SOFTWARE_SHORTCUT_KEY = Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS; private static final String HARDWARE_SHORTCUT_KEY = Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE; - @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); private TestAccessibilityShortcutPreferenceFragment mFragment; private PreferenceScreen mScreen; private Context mContext = ApplicationProvider.getApplicationContext(); @@ -151,14 +141,6 @@ public class AccessibilityShortcutPreferenceFragmentTest { assertThat(expectedType).isEqualTo(HARDWARE); } - @Test - @Config(shadows = ShadowFragment.class) - public void showQuickSettingsTooltipIfNeeded_dontShowTooltipView() { - mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT); - - assertThat(getLatestPopupWindow()).isNull(); - } - @Test @Config(shadows = ShadowFragment.class) public void showGeneralCategory_shouldInitCategory() { @@ -260,16 +242,6 @@ public class AccessibilityShortcutPreferenceFragmentTest { return PLACEHOLDER_PACKAGE_NAME; } - @Override - protected ComponentName getTileComponentName() { - return PLACEHOLDER_TILE_COMPONENT_NAME; - } - - @Override - protected CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { - return PLACEHOLDER_TILE_TOOLTIP_CONTENT; - } - @Override public int getUserShortcutTypes() { return 0; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index 86322f916b0..6dbb8b58354 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -315,14 +315,6 @@ public class ToggleFeaturePreferenceFragmentTest { .isEqualTo(PLACEHOLDER_COMPONENT_NAME.flattenToString()); } - @Test - @Config(shadows = ShadowFragment.class) - public void showQuickSettingsTooltipIfNeeded_dontShowTooltipView() { - mFragment.showQuickSettingsTooltipIfNeeded(QuickSettingsTooltipType.GUIDE_TO_EDIT); - - assertThat(getLatestPopupWindow()).isNull(); - } - @Test public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() { final PreferredShortcut userPreferredShortcut = new PreferredShortcut( diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java index a03ca6192b6..1ce6c3f5499 100644 --- a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java @@ -21,7 +21,6 @@ import static com.android.settings.gestures.OneHandedSettings.ONE_HANDED_SHORTCU import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; @@ -32,8 +31,6 @@ import android.provider.SearchIndexableResource; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.R; -import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; @@ -62,21 +59,6 @@ public class OneHandedSettingsTest { SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true"); } - @Test - public void getTileTooltipContent_returnsExpectedValues() { - // Simulate to call getTileTooltipContent after onDetach - assertThat(mSettings.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT)) - .isNull(); - // Simulate to call getTileTooltipContent after onAttach - when(mSettings.getContext()).thenReturn(mContext); - assertThat(mSettings.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT)) - .isEqualTo(mContext.getText( - R.string.accessibility_one_handed_mode_qs_tooltip_content)); - assertThat(mSettings.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE)) - .isEqualTo(mContext.getText( - R.string.accessibility_one_handed_mode_auto_added_qs_tooltip_content)); - } - @Test public void getLogTag_returnsCorrectTag() { assertThat(mSettings.getLogTag()).isEqualTo("OneHandedSettings");