diff --git a/res/values/strings.xml b/res/values/strings.xml index b507b9409f3..383d977ce83 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5554,11 +5554,27 @@ Use %1$s Open %1$s - + %1$s added to Quick Settings. Swipe down to turn it on or off anytime. - + You can also add %1$s to Quick Settings from the top of your screen - + + Color correction added to Quick Settings. Swipe down to turn it on or off anytime. + + You can also add color correction to Quick Settings from the top of your screen + + Color inversion added to Quick Settings. Swipe down to turn it on or off anytime. + + You can also add color inversion to Quick Settings from the top of your screen + + Extra dim added to Quick Settings. Swipe down to turn it on or off anytime. + + You can also add extra dim to Quick Settings from the top of your screen + + One-handed mode added to Quick Settings. Swipe down to turn it on or off anytime. + + You can also add one-handed mode to Quick Settings from the top of your screen + Dismiss Adjust how colors display on your phone diff --git a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java new file mode 100644 index 00000000000..33b6deb82b9 --- /dev/null +++ b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.accessibility; + +import android.content.ComponentName; +import android.content.Context; +import android.os.Bundle; +import android.os.Handler; + +import androidx.preference.PreferenceScreen; + +import com.android.settings.R; +import com.android.settings.core.TogglePreferenceController; +import com.android.settingslib.PrimarySwitchPreference; +import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.core.lifecycle.events.OnCreate; +import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; + +/** PrimarySwitchPreferenceController that shows quick settings tooltip on first use. */ +public abstract class AccessibilityQuickSettingsPrimarySwitchPreferenceController + extends TogglePreferenceController + implements LifecycleObserver, OnCreate, OnSaveInstanceState { + private static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow"; + private final Handler mHandler; + private PrimarySwitchPreference mPreference; + private AccessibilityQuickSettingsTooltipWindow mTooltipWindow; + private boolean mNeedsQSTooltipReshow = false; + + /** Returns the accessibility tile component name. */ + abstract ComponentName getTileComponentName(); + + /** Returns the accessibility tile tooltip content. */ + abstract CharSequence getTileTooltipContent(); + + public AccessibilityQuickSettingsPrimarySwitchPreferenceController(Context context, + String preferenceKey) { + super(context, preferenceKey); + mHandler = new Handler(context.getMainLooper()); + } + + @Override + public void onCreate(Bundle savedInstanceState) { + // Restore the tooltip. + if (savedInstanceState != null) { + if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_RESHOW)) { + mNeedsQSTooltipReshow = savedInstanceState.getBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW); + } + } + } + + @Override + public void onSaveInstanceState(Bundle outState) { + if (mTooltipWindow != null) { + outState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, mTooltipWindow.isShowing()); + } + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + mPreference = screen.findPreference(getPreferenceKey()); + if (mNeedsQSTooltipReshow) { + mHandler.post(this::showQuickSettingsTooltipIfNeeded); + } + } + + @Override + public boolean setChecked(boolean isChecked) { + if (isChecked) { + showQuickSettingsTooltipIfNeeded(); + } + return isChecked; + } + + @Override + public boolean isChecked() { + return false; + } + + @Override + public int getAvailabilityStatus() { + return AVAILABLE; + } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_accessibility; + } + + private void showQuickSettingsTooltipIfNeeded() { + final ComponentName tileComponentName = getTileComponentName(); + if (tileComponentName == null) { + // Returns if no tile service assigned. + return; + } + + if (!mNeedsQSTooltipReshow && AccessibilityQuickSettingUtils.hasValueInSharedPreferences( + mContext, tileComponentName)) { + // Returns if quick settings tooltip only show once. + return; + } + + mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(mContext); + mTooltipWindow.setup(getTileTooltipContent(), + R.drawable.accessibility_auto_added_qs_tooltips_illustration); + mTooltipWindow.showAtTopCenter(mPreference.getSwitch()); + AccessibilityQuickSettingUtils.optInValueToSharedPreferences(mContext, tileComponentName); + mNeedsQSTooltipReshow = false; + } +} diff --git a/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java b/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java index 2c77102cc32..6b6872f9275 100644 --- a/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java +++ b/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java @@ -80,7 +80,7 @@ public class AccessibilityQuickSettingsTooltipWindow extends PopupWindow { * @param text text to be displayed * @param imageResId the resource ID of the image drawable */ - public void setup(String text, @DrawableRes int imageResId) { + public void setup(CharSequence text, @DrawableRes int imageResId) { this.setup(text, imageResId, /* closeDelayTimeMillis= */ 0); } @@ -94,7 +94,7 @@ public class AccessibilityQuickSettingsTooltipWindow extends PopupWindow { * @param imageResId the resource ID of the image drawable * @param closeDelayTimeMillis how long the popup window be auto-closed */ - public void setup(String text, @DrawableRes int imageResId, long closeDelayTimeMillis) { + public void setup(CharSequence text, @DrawableRes int imageResId, long closeDelayTimeMillis) { this.mCloseDelayTimeMillis = closeDelayTimeMillis; setBackgroundDrawable(new ColorDrawable(mContext.getColor(android.R.color.transparent))); diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 59618d643fd..9c54a0c8fc5 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -83,8 +83,8 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF /** Returns the accessibility tile component name. */ protected abstract ComponentName getTileComponentName(); - /** Returns the accessibility tile feature name. */ - protected abstract CharSequence getTileName(); + /** Returns the accessibility tile tooltip content. */ + protected abstract CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type); @Override public void onCreate(Bundle savedInstanceState) { @@ -148,7 +148,7 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - // Reshow tooltips when activity recreate, such as rotate device. + // Reshow tooltip when activity recreate, such as rotate device. if (mNeedsQSTooltipReshow) { getView().post(this::showQuickSettingsTooltipIfNeeded); } @@ -499,21 +499,17 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF return; } - final CharSequence tileName = getTileName(); - if (TextUtils.isEmpty(tileName)) { - // Returns if no title of tile service assigned. + final CharSequence content = getTileTooltipContent(mNeedsQSTooltipType); + if (TextUtils.isEmpty(content)) { + // Returns if no content of tile tooltip assigned. return; } - final int titleResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT - ? R.string.accessibility_service_qs_tooltips_content - : R.string.accessibility_service_auto_added_qs_tooltips_content; - final String title = getString(titleResId, tileName); final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT ? R.drawable.accessibility_qs_tooltips_illustration : R.drawable.accessibility_auto_added_qs_tooltips_illustration; mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext()); - mTooltipWindow.setup(title, imageResId); + mTooltipWindow.setup(content, imageResId); mTooltipWindow.showAtTopCenter(getView()); AccessibilityQuickSettingUtils.optInValueToSharedPreferences(getContext(), tileComponentName); diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java index b04582f2023..036b2ea755e 100644 --- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java +++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java @@ -41,6 +41,7 @@ import androidx.annotation.Nullable; import androidx.preference.Preference; import com.android.settings.R; +import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settings.overlay.FeatureFactory; import java.util.ArrayList; @@ -128,12 +129,21 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature } @Override - CharSequence getTileName() { + CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { final ComponentName componentName = getTileComponentName(); if (componentName == null) { return null; } - return loadTileLabel(getPrefContext(), componentName); + + final CharSequence tileName = loadTileLabel(getPrefContext(), componentName); + if (tileName == null) { + return null; + } + + final int titleResId = type == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? R.string.accessibility_service_qs_tooltips_content + : R.string.accessibility_service_auto_added_qs_tooltips_content; + return getString(titleResId, tileName); } @Override diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java index 2018e059693..7b40024ca54 100644 --- a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java +++ b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java @@ -16,6 +16,9 @@ package com.android.settings.accessibility; +import static com.android.internal.accessibility.AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME; + +import android.content.ComponentName; import android.content.Context; import android.database.ContentObserver; import android.hardware.display.ColorDisplayManager; @@ -30,14 +33,14 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.PrimarySwitchPreference; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; /** PreferenceController that shows the Reduce Bright Colors summary */ -public class ReduceBrightColorsPreferenceController extends TogglePreferenceController +public class ReduceBrightColorsPreferenceController + extends AccessibilityQuickSettingsPrimarySwitchPreferenceController implements LifecycleObserver, OnStart, OnStop { private ContentObserver mSettingsContentObserver; private PrimarySwitchPreference mPreference; @@ -67,6 +70,7 @@ public class ReduceBrightColorsPreferenceController extends TogglePreferenceCont @Override public boolean setChecked(boolean isChecked) { + super.setChecked(isChecked); return mColorDisplayManager.setReduceBrightColorsActivated(isChecked); } @@ -105,8 +109,20 @@ public class ReduceBrightColorsPreferenceController extends TogglePreferenceCont Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED), false, mSettingsContentObserver, UserHandle.USER_CURRENT); } + @Override public void onStop() { mContext.getContentResolver().unregisterContentObserver(mSettingsContentObserver); } + + @Override + protected ComponentName getTileComponentName() { + return REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME; + } + + @Override + CharSequence getTileTooltipContent() { + return mContext.getText( + R.string.accessibility_reduce_bright_colors_auto_added_qs_tooltip_content); + } } diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 02da51e5a59..1a63f1fc9b8 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -47,6 +47,7 @@ import android.widget.Switch; import androidx.annotation.Nullable; import com.android.settings.R; +import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.accessibility.AccessibilityUtils; @@ -239,12 +240,21 @@ public class ToggleAccessibilityServicePreferenceFragment extends } @Override - CharSequence getTileName() { + CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { final ComponentName componentName = getTileComponentName(); if (componentName == null) { return null; } - return loadTileLabel(getPrefContext(), componentName); + + final CharSequence tileName = loadTileLabel(getPrefContext(), componentName); + if (tileName == null) { + return null; + } + + final int titleResId = type == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? R.string.accessibility_service_qs_tooltips_content + : R.string.accessibility_service_auto_added_qs_tooltips_content; + return getString(titleResId, tileName); } @Override diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java index 1f498d60af9..58837147969 100644 --- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java @@ -144,8 +144,10 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere } @Override - CharSequence getTileName() { - return getText(R.string.accessibility_display_inversion_preference_title); + CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { + return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? R.string.accessibility_color_inversion_qs_tooltip_content + : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content); } @Override diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index c4df5bf7503..183da964cfc 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -201,8 +201,10 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe } @Override - CharSequence getTileName() { - return getText(R.string.accessibility_display_daltonizer_preference_title); + CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { + return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? R.string.accessibility_color_correction_qs_tooltip_content + : R.string.accessibility_color_correction_auto_added_qs_tooltip_content); } @Override diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 69b8f75c060..9738321fc0c 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -222,7 +222,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference updatePreferenceOrder(); - // Reshow tooltips when activity recreate, such as rotate device. + // Reshow tooltip when activity recreate, such as rotate device. if (mNeedsQSTooltipReshow) { getView().post(this::showQuickSettingsTooltipIfNeeded); } @@ -331,8 +331,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference /** Returns the accessibility tile component name. */ abstract ComponentName getTileComponentName(); - /** Returns the accessibility tile feature name. */ - abstract CharSequence getTileName(); + /** Returns the accessibility tile tooltip content. */ + abstract CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type); protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) { final CharSequence title = @@ -870,21 +870,17 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference return; } - final CharSequence tileName = getTileName(); - if (TextUtils.isEmpty(tileName)) { - // Returns if no title of tile service assigned. + final CharSequence content = getTileTooltipContent(mNeedsQSTooltipType); + if (TextUtils.isEmpty(content)) { + // Returns if no content of tile tooltip assigned. return; } - final int titleResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT - ? R.string.accessibility_service_qs_tooltips_content - : R.string.accessibility_service_auto_added_qs_tooltips_content; - final String title = getString(titleResId, tileName); final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT ? R.drawable.accessibility_qs_tooltips_illustration : R.drawable.accessibility_auto_added_qs_tooltips_illustration; mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext()); - mTooltipWindow.setup(title, imageResId); + mTooltipWindow.setup(content, imageResId); mTooltipWindow.showAtTopCenter(getView()); AccessibilityQuickSettingUtils.optInValueToSharedPreferences(getContext(), tileComponentName); diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java index fb9c4a87ed1..93884b766ea 100644 --- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java @@ -184,8 +184,10 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre } @Override - CharSequence getTileName() { - return getText(R.string.reduce_bright_colors_preference_title); + CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { + return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? R.string.accessibility_reduce_bright_colors_qs_tooltip_content + : R.string.accessibility_reduce_bright_colors_auto_added_qs_tooltip_content); } @Override diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 62f42820401..1176fa462c0 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -47,6 +47,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.settings.DialogCreatable; import com.android.settings.R; import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType; +import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType; import com.android.settings.utils.LocaleUtils; @@ -405,7 +406,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends } @Override - CharSequence getTileName() { + CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { return null; } diff --git a/src/com/android/settings/gestures/OneHandedSettings.java b/src/com/android/settings/gestures/OneHandedSettings.java index 0e6b402429d..13ccbd6919b 100644 --- a/src/com/android/settings/gestures/OneHandedSettings.java +++ b/src/com/android/settings/gestures/OneHandedSettings.java @@ -131,8 +131,10 @@ public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment { } @Override - protected CharSequence getTileName() { - return mFeatureName; + protected CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { + return type == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? getText(R.string.accessibility_one_handed_mode_qs_tooltip_content) + : getText(R.string.accessibility_one_handed_mode_auto_added_qs_tooltip_content); } @Override diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java new file mode 100644 index 00000000000..89c91209ffd --- /dev/null +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.accessibility; + +import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_QS_TOOLTIP_RESHOW; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.content.ComponentName; +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.widget.LinearLayout; +import android.widget.PopupWindow; + +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.test.core.app.ApplicationProvider; + +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.testutils.shadow.ShadowFragment; +import com.android.settingslib.PrimarySwitchPreference; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.Spy; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowApplication; + +/** + * Tests for {@link AccessibilityQuickSettingsPrimarySwitchPreferenceController}. + */ +@RunWith(RobolectricTestRunner.class) +public class AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest { + + private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example"; + private static final String PLACEHOLDER_TILE_CLASS_NAME = + PLACEHOLDER_PACKAGE_NAME + "tile.placeholder"; + private static final ComponentName PLACEHOLDER_TILE_COMPONENT_NAME = new ComponentName( + PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME); + private static final CharSequence PLACEHOLDER_TILE_CONTENT = + PLACEHOLDER_TILE_CLASS_NAME + ".tile.content"; + private static final String TEST_KEY = "test_pref_key"; + private static final String TEST_TITLE = "test_title"; + + @Rule + public final MockitoRule mockito = MockitoJUnit.rule(); + + @Spy + private final Context mContext = ApplicationProvider.getApplicationContext(); + + private TestAccessibilityQuickSettingsPrimarySwitchPreferenceController mController; + private PrimarySwitchPreference mPreference; + private TestFragment mFragment; + private PreferenceScreen mScreen; + private PreferenceViewHolder mHolder; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private PreferenceManager mPreferenceManager; + + private static PopupWindow getLatestPopupWindow() { + final ShadowApplication shadowApplication = + Shadow.extract(ApplicationProvider.getApplicationContext()); + return shadowApplication.getLatestPopupWindow(); + } + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mContext.setTheme(R.style.Theme_AppCompat); + mFragment = spy(new TestFragment()); + when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); + when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext); + when(mFragment.getContext()).thenReturn(mContext); + mScreen = spy(new PreferenceScreen(mContext, /* attrs= */ null)); + when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager); + doReturn(mScreen).when(mFragment).getPreferenceScreen(); + + mPreference = new PrimarySwitchPreference(mContext); + mPreference.setKey(TEST_KEY); + mPreference.setTitle(TEST_TITLE); + LayoutInflater inflater = LayoutInflater.from(mContext); + mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate( + com.android.settingslib.R.layout.preference_two_target, null)); + LinearLayout mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame); + inflater.inflate(R.layout.preference_widget_primary_switch, mWidgetView, true); + mPreference.onBindViewHolder(mHolder); + + mController = new TestAccessibilityQuickSettingsPrimarySwitchPreferenceController(mContext, + TEST_KEY); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + mController.displayPreference(mScreen); + } + + @Test + public void setChecked_showTooltipView() { + mController.setChecked(true); + + assertThat(getLatestPopupWindow().isShowing()).isTrue(); + } + + @Test + public void setChecked_tooltipViewShown_notShowTooltipView() { + mController.setChecked(true); + getLatestPopupWindow().dismiss(); + mController.setChecked(false); + + mController.setChecked(true); + + assertThat(getLatestPopupWindow().isShowing()).isFalse(); + } + + @Test + @Config(shadows = ShadowFragment.class) + public void restoreValueFromSavedInstanceState_showTooltipView() { + mController.setChecked(true); + final Bundle savedInstanceState = new Bundle(); + savedInstanceState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true); + + mFragment.onCreate(savedInstanceState); + mController.displayPreference(mScreen); + + assertThat(getLatestPopupWindow().isShowing()).isTrue(); + } + + public static class TestAccessibilityQuickSettingsPrimarySwitchPreferenceController + extends AccessibilityQuickSettingsPrimarySwitchPreferenceController { + + public TestAccessibilityQuickSettingsPrimarySwitchPreferenceController(Context context, + String preferenceKey) { + super(context, preferenceKey); + } + + @Override + ComponentName getTileComponentName() { + return PLACEHOLDER_TILE_COMPONENT_NAME; + } + + @Override + CharSequence getTileTooltipContent() { + return PLACEHOLDER_TILE_CONTENT; + } + } + + private static class TestFragment extends SettingsPreferenceFragment { + + @Override + protected boolean shouldSkipForInitialSUW() { + return false; + } + + @Override + public int getMetricsCategory() { + return 0; + } + } +} diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java index d05600adad6..c7a5884d6e2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java @@ -73,6 +73,8 @@ public class AccessibilityShortcutPreferenceFragmentTest { 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 = @@ -281,8 +283,8 @@ public class AccessibilityShortcutPreferenceFragmentTest { } @Override - protected CharSequence getTileName() { - return PLACEHOLDER_PACKAGE_NAME; + protected CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { + return PLACEHOLDER_TILE_TOOLTIP_CONTENT; } @Override diff --git a/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java index c44352f6932..4660f77f275 100644 --- a/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java @@ -34,6 +34,9 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; +import com.android.settings.R; +import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,8 +47,6 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -import java.util.Arrays; - /** Tests for {@link LaunchAccessibilityActivityPreferenceFragment} */ @RunWith(RobolectricTestRunner.class) public class LaunchAccessibilityActivityPreferenceFragmentTest { @@ -83,53 +84,91 @@ public class LaunchAccessibilityActivityPreferenceFragmentTest { } @Test - public void getTileName_noTileServiceAssigned_returnNull() { - assertThat(mFragment.getTileName()).isNull(); + public void getTileTooltipContent_noTileServiceAssigned_returnNull() { + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT); + + assertThat(tileTooltipContent).isNull(); } @Test - public void getTileName_hasOneTileService_haveMatchString() { - final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE); - final ResolveInfo info = new ResolveInfo(); - info.serviceInfo = new FakeServiceInfo(); - info.serviceInfo.packageName = PLACEHOLDER_PACKAGE_NAME; - info.serviceInfo.name = PLACEHOLDER_TILE_CLASS_NAME; - final ShadowPackageManager shadowPackageManager = - Shadows.shadowOf(mContext.getPackageManager()); - shadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info)); + public void getTileTooltipContent_hasOneTileService_guideToEdit_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); - final CharSequence tileName = mFragment.getTileName(); - assertThat(tileName.toString()).isEqualTo(PLACEHOLDER_TILE_NAME); + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName)); } @Test - public void getTileName_hasTwoTileServices_haveMatchString() { + public void getTileTooltipContent_hasOneTileService_guideToDirectUse_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); + + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString( + R.string.accessibility_service_auto_added_qs_tooltips_content, tileName)); + } + + @Test + public void getTileTooltipContent_hasTwoTileServices_guideToEdit_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME2, + PLACEHOLDER_TILE_NAME2); + + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName)); + } + + @Test + public void getTileTooltipContent_hasTwoTileServices_guideToDirectUse_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME2, + PLACEHOLDER_TILE_NAME2); + + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString( + R.string.accessibility_service_auto_added_qs_tooltips_content, tileName)); + } + + private void setupTileService(String packageName, String name, String tileName) { final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE); final ResolveInfo info = new ResolveInfo(); - info.serviceInfo = new FakeServiceInfo(); - info.serviceInfo.packageName = PLACEHOLDER_PACKAGE_NAME; - info.serviceInfo.name = PLACEHOLDER_TILE_CLASS_NAME; - final ResolveInfo info2 = new ResolveInfo(); - info2.serviceInfo = new FakeServiceInfo2(); - info2.serviceInfo.packageName = PLACEHOLDER_PACKAGE_NAME; - info2.serviceInfo.name = PLACEHOLDER_TILE_CLASS_NAME2; + info.serviceInfo = new FakeServiceInfo(packageName, name, tileName); final ShadowPackageManager shadowPackageManager = Shadows.shadowOf(mContext.getPackageManager()); - shadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info, info2)); - - final CharSequence tileName = mFragment.getTileName(); - assertThat(tileName.toString()).isEqualTo(PLACEHOLDER_TILE_NAME); + shadowPackageManager.addResolveInfoForIntent(tileProbe, info); } private static class FakeServiceInfo extends ServiceInfo { - public String loadLabel(PackageManager mgr) { - return PLACEHOLDER_TILE_NAME; - } - } + private String mTileName; + + FakeServiceInfo(String packageName, String name, String tileName) { + this.packageName = packageName; + this.name = name; + mTileName = tileName; + } - private static class FakeServiceInfo2 extends ServiceInfo { public String loadLabel(PackageManager mgr) { - return PLACEHOLDER_TILE_NAME2; + return mTileName; } } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java index 236f9f2307c..ad5171ddaf5 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java @@ -34,6 +34,9 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; +import com.android.settings.R; +import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,8 +47,6 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -import java.util.Arrays; - /** Tests for {@link ToggleAccessibilityServicePreferenceFragment} */ @RunWith(RobolectricTestRunner.class) public class ToggleAccessibilityServicePreferenceFragmentTest { @@ -83,53 +84,91 @@ public class ToggleAccessibilityServicePreferenceFragmentTest { } @Test - public void getTileName_noTileServiceAssigned_returnNull() { - assertThat(mFragment.getTileName()).isNull(); + public void getTileTooltipContent_noTileServiceAssigned_returnNull() { + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT); + + assertThat(tileTooltipContent).isNull(); } @Test - public void getTileName_hasOneTileService_haveMatchString() { - final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE); - final ResolveInfo info = new ResolveInfo(); - info.serviceInfo = new FakeServiceInfo(); - info.serviceInfo.packageName = PLACEHOLDER_PACKAGE_NAME; - info.serviceInfo.name = PLACEHOLDER_TILE_CLASS_NAME; - final ShadowPackageManager shadowPackageManager = - Shadows.shadowOf(mContext.getPackageManager()); - shadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info)); + public void getTileTooltipContent_hasOneTileService_guideToEdit_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); - final CharSequence tileName = mFragment.getTileName(); - assertThat(tileName.toString()).isEqualTo(PLACEHOLDER_TILE_NAME); + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName)); } @Test - public void getTileName_hasTwoTileServices_haveMatchString() { + public void getTileTooltipContent_hasOneTileService_guideToDirectUse_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); + + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString( + R.string.accessibility_service_auto_added_qs_tooltips_content, tileName)); + } + + @Test + public void getTileTooltipContent_hasTwoTileServices_guideToEdit_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME2, + PLACEHOLDER_TILE_NAME2); + + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_EDIT); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName)); + } + + @Test + public void getTileTooltipContent_hasTwoTileServices_guideToDirectUse_haveMatchString() { + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME, + PLACEHOLDER_TILE_NAME); + setupTileService(PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME2, + PLACEHOLDER_TILE_NAME2); + + final CharSequence tileTooltipContent = + mFragment.getTileTooltipContent(QuickSettingsTooltipType.GUIDE_TO_DIRECT_USE); + final CharSequence tileName = + mFragment.loadTileLabel(mContext, mFragment.getTileComponentName()); + assertThat(tileTooltipContent.toString()).isEqualTo( + mContext.getString( + R.string.accessibility_service_auto_added_qs_tooltips_content, tileName)); + } + + private void setupTileService(String packageName, String name, String tileName) { final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE); final ResolveInfo info = new ResolveInfo(); - info.serviceInfo = new FakeServiceInfo(); - info.serviceInfo.packageName = PLACEHOLDER_PACKAGE_NAME; - info.serviceInfo.name = PLACEHOLDER_TILE_CLASS_NAME; - final ResolveInfo info2 = new ResolveInfo(); - info2.serviceInfo = new FakeServiceInfo2(); - info2.serviceInfo.packageName = PLACEHOLDER_PACKAGE_NAME; - info2.serviceInfo.name = PLACEHOLDER_TILE_CLASS_NAME2; + info.serviceInfo = new FakeServiceInfo(packageName, name, tileName); final ShadowPackageManager shadowPackageManager = Shadows.shadowOf(mContext.getPackageManager()); - shadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info, info2)); - - final CharSequence tileName = mFragment.getTileName(); - assertThat(tileName.toString()).isEqualTo(PLACEHOLDER_TILE_NAME); + shadowPackageManager.addResolveInfoForIntent(tileProbe, info); } private static class FakeServiceInfo extends ServiceInfo { - public String loadLabel(PackageManager mgr) { - return PLACEHOLDER_TILE_NAME; - } - } + private String mTileName; + + FakeServiceInfo(String packageName, String name, String tileName) { + this.packageName = packageName; + this.name = name; + mTileName = tileName; + } - private static class FakeServiceInfo2 extends ServiceInfo { public String loadLabel(PackageManager mgr) { - return PLACEHOLDER_TILE_NAME2; + return mTileName; } } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index 34a2f5b3eba..04018a6b6d7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -49,6 +49,7 @@ import androidx.test.core.app.ApplicationProvider; import com.android.settings.R; import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType; +import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType; import com.android.settings.testutils.shadow.ShadowFragment; import com.android.settingslib.widget.TopIntroPreference; @@ -77,8 +78,8 @@ public class ToggleFeaturePreferenceFragmentTest { PLACEHOLDER_PACKAGE_NAME + "tile.placeholder"; private static final ComponentName PLACEHOLDER_TILE_COMPONENT_NAME = new ComponentName( PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME); - private static final String PLACEHOLDER_TILE_NAME = - PLACEHOLDER_PACKAGE_NAME + "tile.placeholder"; + 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 DEFAULT_SUMMARY = "default summary"; private static final String DEFAULT_DESCRIPTION = "default description"; @@ -361,8 +362,8 @@ public class ToggleFeaturePreferenceFragmentTest { } @Override - CharSequence getTileName() { - return PLACEHOLDER_TILE_NAME; + protected CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) { + return PLACEHOLDER_TILE_TOOLTIP_CONTENT; } @Override