diff --git a/src/com/android/settings/accessibility/BaseCaptioningCustomController.java b/src/com/android/settings/accessibility/BaseCaptioningCustomController.java new file mode 100644 index 00000000000..68883d55735 --- /dev/null +++ b/src/com/android/settings/accessibility/BaseCaptioningCustomController.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2024 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.Context; + +import com.android.settings.core.BasePreferenceController; + +public class BaseCaptioningCustomController extends BasePreferenceController { + protected final CaptionHelper mCaptionHelper; + + public BaseCaptioningCustomController(Context context, String preferenceKey) { + super(context, preferenceKey); + mCaptionHelper = new CaptionHelper(context); + } + + @Override + public int getAvailabilityStatus() { + return mCaptionHelper.getCustomCaptionAvailability(); + } +} diff --git a/src/com/android/settings/accessibility/CaptionHelper.java b/src/com/android/settings/accessibility/CaptionHelper.java index 36d833c4876..f23b40cbf58 100644 --- a/src/com/android/settings/accessibility/CaptionHelper.java +++ b/src/com/android/settings/accessibility/CaptionHelper.java @@ -18,6 +18,8 @@ package com.android.settings.accessibility; import static com.android.settings.accessibility.AccessibilityUtil.State.OFF; import static com.android.settings.accessibility.AccessibilityUtil.State.ON; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; import android.content.ContentResolver; import android.content.Context; @@ -211,4 +213,14 @@ public class CaptionHelper { public Locale getLocale() { return mCaptioningManager.getLocale(); } + + /** Returns availability for custom caption preferences, depending on current user style. */ + public int getCustomCaptionAvailability() { + if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) { + return (getRawUserStyle() == CaptionStyle.PRESET_CUSTOM) + ? AVAILABLE : AVAILABLE_UNSEARCHABLE; + } else { + return AVAILABLE; + } + } } diff --git a/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java b/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java index 686f725e78f..e6958094a77 100644 --- a/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java +++ b/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java @@ -25,23 +25,15 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning background color. */ -public class CaptioningBackgroundColorController extends BasePreferenceController +public class CaptioningBackgroundColorController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; private int mCachedNonDefaultOpacity = CaptionStyle.COLOR_UNSPECIFIED; public CaptioningBackgroundColorController(Context context, String preferenceKey) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; } @Override diff --git a/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java b/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java index 405f6d9fac9..d13e1cbd07e 100644 --- a/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java +++ b/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java @@ -23,22 +23,13 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning background opacity. */ -public class CaptioningBackgroundOpacityController extends BasePreferenceController +public class CaptioningBackgroundOpacityController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; - public CaptioningBackgroundOpacityController(Context context, String preferenceKey) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; } @Override diff --git a/src/com/android/settings/accessibility/CaptioningCustomController.java b/src/com/android/settings/accessibility/CaptioningCustomController.java index 1b5b7e161e8..e30c90ae968 100644 --- a/src/com/android/settings/accessibility/CaptioningCustomController.java +++ b/src/com/android/settings/accessibility/CaptioningCustomController.java @@ -28,7 +28,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; @@ -37,12 +36,11 @@ import java.util.Arrays; import java.util.List; /** Preference controller for captioning custom visibility. */ -public class CaptioningCustomController extends BasePreferenceController +public class CaptioningCustomController extends BaseCaptioningCustomController implements LifecycleObserver, OnStart, OnStop { @Nullable private Preference mCustom; - private final CaptionHelper mCaptionHelper; private final ContentResolver mContentResolver; @VisibleForTesting AccessibilitySettingsContentObserver mSettingsContentObserver; @@ -52,16 +50,15 @@ public class CaptioningCustomController extends BasePreferenceController ); public CaptioningCustomController(Context context, String preferenceKey) { - this(context, preferenceKey, new CaptionHelper(context), + this(context, preferenceKey, new AccessibilitySettingsContentObserver(new Handler(Looper.getMainLooper()))); } @VisibleForTesting CaptioningCustomController( - Context context, String preferenceKey, CaptionHelper captionHelper, + Context context, String preferenceKey, AccessibilitySettingsContentObserver contentObserver) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); mContentResolver = context.getContentResolver(); mSettingsContentObserver = contentObserver; mSettingsContentObserver.registerKeysToObserverCallback(CAPTIONING_FEATURE_KEYS, key -> { @@ -71,15 +68,6 @@ public class CaptioningCustomController extends BasePreferenceController }); } - @Override - public int getAvailabilityStatus() { - if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) { - return (shouldShowPreference()) ? AVAILABLE : AVAILABLE_UNSEARCHABLE; - } else { - return AVAILABLE; - } - } - @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); diff --git a/src/com/android/settings/accessibility/CaptioningEdgeColorController.java b/src/com/android/settings/accessibility/CaptioningEdgeColorController.java index 4903ff4deab..bb9ce076a27 100644 --- a/src/com/android/settings/accessibility/CaptioningEdgeColorController.java +++ b/src/com/android/settings/accessibility/CaptioningEdgeColorController.java @@ -23,22 +23,13 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning edge color. */ -public class CaptioningEdgeColorController extends BasePreferenceController +public class CaptioningEdgeColorController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; - public CaptioningEdgeColorController(Context context, String preferenceKey) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; } @Override diff --git a/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java b/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java index adb66d34c17..9e2ac205d87 100644 --- a/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java +++ b/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java @@ -21,22 +21,13 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning edge type. */ -public class CaptioningEdgeTypeController extends BasePreferenceController +public class CaptioningEdgeTypeController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; - public CaptioningEdgeTypeController(Context context, String preferenceKey) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; } @Override diff --git a/src/com/android/settings/accessibility/CaptioningForegroundColorController.java b/src/com/android/settings/accessibility/CaptioningForegroundColorController.java index 8e9ec1879ee..4fc9c1bd940 100644 --- a/src/com/android/settings/accessibility/CaptioningForegroundColorController.java +++ b/src/com/android/settings/accessibility/CaptioningForegroundColorController.java @@ -24,23 +24,15 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning foreground color. */ -public class CaptioningForegroundColorController extends BasePreferenceController +public class CaptioningForegroundColorController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; private int mCachedNonDefaultOpacity = CaptionStyle.COLOR_UNSPECIFIED; public CaptioningForegroundColorController(Context context, String preferenceKey) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; } @Override diff --git a/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java b/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java index ab8a84b380f..c295399b5d2 100644 --- a/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java +++ b/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java @@ -23,22 +23,13 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning foreground opacity. */ -public class CaptioningForegroundOpacityController extends BasePreferenceController +public class CaptioningForegroundOpacityController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; - public CaptioningForegroundOpacityController(Context context, String preferenceKey) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; } @Override diff --git a/src/com/android/settings/accessibility/CaptioningTypefaceController.java b/src/com/android/settings/accessibility/CaptioningTypefaceController.java index d8222fa0b50..8eb6cd170f3 100644 --- a/src/com/android/settings/accessibility/CaptioningTypefaceController.java +++ b/src/com/android/settings/accessibility/CaptioningTypefaceController.java @@ -23,22 +23,12 @@ import android.view.accessibility.CaptioningManager.CaptionStyle; import androidx.preference.ListPreference; import androidx.preference.Preference; -import com.android.settings.core.BasePreferenceController; - /** Preference controller for captioning type face. */ -public class CaptioningTypefaceController extends BasePreferenceController +public class CaptioningTypefaceController extends BaseCaptioningCustomController implements Preference.OnPreferenceChangeListener { - private final CaptionHelper mCaptionHelper; - public CaptioningTypefaceController(Context context, String preferenceKey) { super(context, preferenceKey); - mCaptionHelper = new CaptionHelper(context); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; } @Override diff --git a/src/com/android/settings/accessibility/CaptioningWindowColorController.java b/src/com/android/settings/accessibility/CaptioningWindowColorController.java index b72b9739084..ff67420df71 100644 --- a/src/com/android/settings/accessibility/CaptioningWindowColorController.java +++ b/src/com/android/settings/accessibility/CaptioningWindowColorController.java @@ -19,43 +19,21 @@ package com.android.settings.accessibility; import android.content.Context; import android.content.res.Resources; import android.graphics.Color; -import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager.CaptionStyle; import androidx.preference.PreferenceScreen; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning window color. */ -public class CaptioningWindowColorController extends BasePreferenceController +public class CaptioningWindowColorController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; private int mCachedNonDefaultOpacity = CaptionStyle.COLOR_UNSPECIFIED; - @VisibleForTesting - CaptioningWindowColorController(Context context, String preferenceKey, - CaptionHelper captionHelper) { - super(context, preferenceKey); - mCaptionHelper = captionHelper; - } - public CaptioningWindowColorController(Context context, String preferenceKey) { - this(context, preferenceKey, new CaptionHelper(context)); - } - - @Override - public int getAvailabilityStatus() { - if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) { - return (mCaptionHelper.getRawUserStyle() - == CaptioningManager.CaptionStyle.PRESET_CUSTOM) - ? AVAILABLE : AVAILABLE_UNSEARCHABLE; - } else { - return AVAILABLE; - } + super(context, preferenceKey); } @Override diff --git a/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java b/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java index 0e6c6ff4822..5ad29db8b83 100644 --- a/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java +++ b/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java @@ -18,41 +18,18 @@ package com.android.settings.accessibility; import android.content.Context; import android.content.res.Resources; -import android.view.accessibility.CaptioningManager; import androidx.preference.PreferenceScreen; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; -import com.android.settings.core.BasePreferenceController; /** Preference controller for captioning window opacity. */ -public class CaptioningWindowOpacityController extends BasePreferenceController +public class CaptioningWindowOpacityController extends BaseCaptioningCustomController implements OnValueChangedListener { - private final CaptionHelper mCaptionHelper; - - @VisibleForTesting - CaptioningWindowOpacityController(Context context, String preferenceKey, - CaptionHelper captionHelper) { - super(context, preferenceKey); - mCaptionHelper = captionHelper; - } - public CaptioningWindowOpacityController(Context context, String preferenceKey) { - this(context, preferenceKey, new CaptionHelper(context)); - } - - @Override - public int getAvailabilityStatus() { - if (com.android.settings.accessibility.Flags.fixA11ySettingsSearch()) { - return (mCaptionHelper.getRawUserStyle() - == CaptioningManager.CaptionStyle.PRESET_CUSTOM) - ? AVAILABLE : AVAILABLE_UNSEARCHABLE; - } else { - return AVAILABLE; - } + super(context, preferenceKey); } @Override diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java index c1a1799b6bc..7aaf71b691b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java @@ -26,6 +26,9 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.view.View; import android.view.accessibility.CaptioningManager; @@ -35,6 +38,7 @@ import androidx.test.core.app.ApplicationProvider; import com.android.internal.widget.SubtitleView; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; import org.junit.Before; import org.junit.Rule; @@ -54,6 +58,8 @@ public class CaptionHelperTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @Mock private CaptioningManager mCaptioningManager; @Mock @@ -182,4 +188,40 @@ public class CaptionHelperTest { Settings.Secure.ACCESSIBILITY_CAPTIONING_PRESET, 0); assertThat(style).isEqualTo(CaptionStyle.PRESET_CUSTOM); } + + @Test + @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void getAvailabilityStatus_flagOff_customCaption_shouldReturnAvailable() { + when(mCaptioningManager.getRawUserStyle()).thenReturn(CaptionStyle.PRESET_CUSTOM); + + assertThat(mCaptionHelper.getCustomCaptionAvailability()) + .isEqualTo(BasePreferenceController.AVAILABLE); + } + + @Test + @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void getAvailabilityStatus_flagOff_notCustom_shouldReturnAvailable() { + when(mCaptioningManager.getRawUserStyle()).thenReturn(0); + + assertThat(mCaptionHelper.getCustomCaptionAvailability()) + .isEqualTo(BasePreferenceController.AVAILABLE); + } + + @Test + @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void getAvailabilityStatus_customCaption_shouldReturnAvailable() { + when(mCaptioningManager.getRawUserStyle()).thenReturn(CaptionStyle.PRESET_CUSTOM); + + assertThat(mCaptionHelper.getCustomCaptionAvailability()) + .isEqualTo(BasePreferenceController.AVAILABLE); + } + + @Test + @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) + public void getAvailabilityStatus_notCustom_shouldReturnUnsearchable() { + when(mCaptioningManager.getRawUserStyle()).thenReturn(0); + + assertThat(mCaptionHelper.getCustomCaptionAvailability()) + .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); + } } diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java index e847f438070..bc7c0334b58 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java @@ -32,8 +32,6 @@ import android.view.accessibility.CaptioningManager.CaptionStyle; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -70,12 +68,6 @@ public class CaptioningBackgroundColorControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - @Test public void getSummary_defaultValue_shouldReturnBlack() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java index 5036ba03706..08a8a86f7a7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java @@ -31,8 +31,6 @@ import android.view.accessibility.CaptioningManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -69,12 +67,6 @@ public class CaptioningBackgroundOpacityControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - @Test public void getSummary_defaultValue_shouldReturnNonTransparent() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java index e0e5d4981b6..37ad3f889a2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java @@ -23,9 +23,6 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; -import android.platform.test.annotations.DisableFlags; -import android.platform.test.annotations.EnableFlags; -import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.view.accessibility.CaptioningManager.CaptionStyle; @@ -33,8 +30,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -52,8 +47,6 @@ public class CaptioningCustomControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); - @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @Mock private PreferenceScreen mScreen; @Mock @@ -62,44 +55,16 @@ public class CaptioningCustomControllerTest { private ContentResolver mContentResolver; private CaptioningCustomController mController; private Preference mPreference; - private CaptionHelper mCaptionHelper; @Before public void setUp() { mContentResolver = mContext.getContentResolver(); - mCaptionHelper = new CaptionHelper(mContext); - mController = new CaptioningCustomController(mContext, PREF_KEY, mCaptionHelper, + mController = new CaptioningCustomController(mContext, PREF_KEY, mAccessibilitySettingsContentObserver); mPreference = new Preference(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } - @Test - @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - - @Test - @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_customCaption_shouldReturnAvailable() { - mCaptionHelper.setRawUserStyle(CaptionStyle.PRESET_CUSTOM); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - - @Test - @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_notCustom_shouldReturnUnsearchable() { - mCaptionHelper.setRawUserStyle(0); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); - } - - @Test public void displayPreference_byDefault_shouldIsInvisible() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java index c55e087df77..21d6daefdaa 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java @@ -31,8 +31,6 @@ import android.view.accessibility.CaptioningManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -67,12 +65,6 @@ public class CaptioningEdgeColorControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - @Test public void getSummary_defaultValue_shouldReturnBlack() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java index 354115f65ba..0aab4475009 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java @@ -32,8 +32,6 @@ import android.view.accessibility.CaptioningManager.CaptionStyle; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -69,12 +67,6 @@ public class CaptioningEdgeTypeControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - @Test public void getSummary_defaultValue_shouldReturnNone() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java index b00d8d899f7..c222d3fd66d 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java @@ -22,7 +22,6 @@ import static com.android.settings.accessibility.AccessibilityUtil.State.ON; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; - import static org.robolectric.Shadows.shadowOf; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java index 9e9c926defc..59364cdada7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java @@ -32,8 +32,6 @@ import android.view.accessibility.CaptioningManager.CaptionStyle; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -70,12 +68,6 @@ public class CaptioningForegroundColorControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - @Test public void getSummary_defaultValue_shouldReturnWhite() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java index a88b5f54f77..6aaa4a78611 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java @@ -31,8 +31,6 @@ import android.view.accessibility.CaptioningManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -69,12 +67,6 @@ public class CaptioningForegroundOpacityControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - @Test public void getSummary_defaultValue_shouldReturnNonTransparent() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java index aa7d3eb53a9..b029f3f8702 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; import org.junit.Before; import org.junit.Rule; @@ -70,12 +69,6 @@ public class CaptioningTypefaceControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - @Test public void updateState_byDefault_shouldReturnDefault() { mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java index e39c57e8837..2e276c5b14a 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java @@ -24,8 +24,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.platform.test.annotations.DisableFlags; -import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.util.AttributeSet; @@ -36,7 +34,6 @@ import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; import org.junit.Before; import org.junit.Rule; @@ -64,13 +61,11 @@ public class CaptioningWindowColorControllerTest { private CaptioningWindowColorController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; - private CaptionHelper mCaptionHelper; @Before public void setUp() { - mCaptionHelper = new CaptionHelper(mContext); mController = new CaptioningWindowColorController( - mContext, "captioning_window_color", mCaptionHelper); + mContext, "captioning_window_color"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); @@ -78,31 +73,6 @@ public class CaptioningWindowColorControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - - @Test - @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_customCaption_shouldReturnAvailable() { - mCaptionHelper.setRawUserStyle(CaptionStyle.PRESET_CUSTOM); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - - @Test - @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_noCustom_shouldReturnUnsearchable() { - mCaptionHelper.setRawUserStyle(0); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE); - } - @Test public void getSummary_defaultValue_shouldReturnNone() { mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java index 2b41eb053d9..aae53d08b06 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java @@ -24,8 +24,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.platform.test.annotations.DisableFlags; -import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.util.AttributeSet; @@ -34,8 +32,6 @@ import android.view.accessibility.CaptioningManager; import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; -import com.android.settings.core.BasePreferenceController; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -62,13 +58,11 @@ public class CaptioningWindowOpacityControllerTest { private CaptioningWindowOpacityController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; - private CaptionHelper mCaptionHelper; @Before public void setUp() { - mCaptionHelper = new CaptionHelper(mContext); mController = new CaptioningWindowOpacityController( - mContext, "captioning_window_opacity", mCaptionHelper); + mContext, "captioning_window_opacity"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); @@ -76,31 +70,6 @@ public class CaptioningWindowOpacityControllerTest { mShadowCaptioningManager = Shadow.extract(captioningManager); } - @Test - @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - - @Test - @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_customCaption_shouldReturnAvailable() { - mCaptionHelper.setRawUserStyle(CaptioningManager.CaptionStyle.PRESET_CUSTOM); - - assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.AVAILABLE); - } - - @Test - @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH) - public void getAvailabilityStatus_notCustom_shouldReturnUnsearchable() { - mCaptionHelper.setRawUserStyle(0); - - assertThat(mController.getAvailabilityStatus()).isEqualTo( - BasePreferenceController.AVAILABLE_UNSEARCHABLE); - } - @Test public void getSummary_defaultValue_shouldReturnNonTransparent() { mController.displayPreference(mScreen);