From e57125650d457950035761fa8b7717fb19763a76 Mon Sep 17 00:00:00 2001 From: menghanli Date: Mon, 1 Aug 2022 16:47:12 +0800 Subject: [PATCH] Unify the caption preference class naming Bug: 197695932 Test: make RunSettingsRoboTests Change-Id: Ice244442ad21e6d9f006d488992e9f58cf5c8fb0 --- AndroidManifest.xml | 2 +- ...ml => accessibility_captioning_banner.xml} | 0 res/values/dimens.xml | 4 +-- res/values/strings.xml | 28 +++++++-------- res/xml/accessibility_settings.xml | 3 +- res/xml/captioning_appearance.xml | 35 +++++++++---------- res/xml/captioning_more_options.xml | 7 ++-- res/xml/captioning_settings.xml | 33 +++++++---------- .../settings/accessibility/CaptionHelper.java | 2 +- ...java => CaptioningAppearanceFragment.java} | 4 +-- ...ioningAppearancePreferenceController.java} | 6 ++-- ... CaptioningBackgroundColorController.java} | 6 ++-- ...aptioningBackgroundOpacityController.java} | 6 ++-- ...r.java => CaptioningCustomController.java} | 8 ++--- ...ava => CaptioningEdgeColorController.java} | 6 ++-- ...java => CaptioningEdgeTypeController.java} | 6 ++-- ...java => CaptioningFontSizeController.java} | 6 ++-- ...CaptioningFooterPreferenceController.java} | 8 ++--- ... CaptioningForegroundColorController.java} | 6 ++-- ...aptioningForegroundOpacityController.java} | 6 ++-- ...CaptioningLocalePreferenceController.java} | 6 ++-- ...ava => CaptioningMoreOptionsFragment.java} | 4 +-- ...r.java => CaptioningPresetController.java} | 6 ++-- ...aptioningPreviewPreferenceController.java} | 6 ++-- ...java => CaptioningPropertiesFragment.java} | 4 +-- ...CaptioningTogglePreferenceController.java} | 6 ++-- ...java => CaptioningTypefaceController.java} | 6 ++-- ...a => CaptioningWindowColorController.java} | 6 ++-- ...=> CaptioningWindowOpacityController.java} | 6 ++-- .../core/gateway/SettingsGateway.java | 4 +-- .../accessibility/CaptionHelperTest.java | 2 +- ... => CaptioningAppearanceFragmentTest.java} | 12 +++---- ...ngAppearancePreferenceControllerTest.java} | 8 ++--- ...tioningBackgroundColorControllerTest.java} | 9 ++--- ...oningBackgroundOpacityControllerTest.java} | 8 ++--- ...va => CaptioningCustomControllerTest.java} | 8 ++--- ...=> CaptioningEdgeColorControllerTest.java} | 8 ++--- ... => CaptioningEdgeTypeControllerTest.java} | 8 ++--- ... => CaptioningFontSizeControllerTest.java} | 8 ++--- ...tioningForegroundColorControllerTest.java} | 9 ++--- ...oningForegroundOpacityControllerTest.java} | 10 +++--- ...ioningLocalePreferenceControllerTest.java} | 8 ++--- ...=> CaptioningMoreOptionsFragmentTest.java} | 12 +++---- .../CaptioningPreferenceControllerTest.java | 6 ++-- ...va => CaptioningPresetControllerTest.java} | 8 ++--- ...oningPreviewPreferenceControllerTest.java} | 8 ++--- ... => CaptioningPropertiesFragmentTest.java} | 12 +++---- ...ioningTogglePreferenceControllerTest.java} | 8 ++--- ... => CaptioningTypefaceControllerTest.java} | 8 ++--- ... CaptioningWindowColorControllerTest.java} | 8 ++--- ...aptioningWindowOpacityControllerTest.java} | 8 ++--- 51 files changed, 202 insertions(+), 210 deletions(-) rename res/drawable/{accessibility_captions_banner.xml => accessibility_captioning_banner.xml} (100%) rename src/com/android/settings/accessibility/{CaptionAppearanceFragment.java => CaptioningAppearanceFragment.java} (92%) rename src/com/android/settings/accessibility/{CaptionAppearancePreferenceController.java => CaptioningAppearancePreferenceController.java} (92%) rename src/com/android/settings/accessibility/{CaptionBackgroundColorController.java => CaptioningBackgroundColorController.java} (92%) rename src/com/android/settings/accessibility/{CaptionBackgroundOpacityController.java => CaptioningBackgroundOpacityController.java} (91%) rename src/com/android/settings/accessibility/{CaptionCustomController.java => CaptioningCustomController.java} (91%) rename src/com/android/settings/accessibility/{CaptionEdgeColorController.java => CaptioningEdgeColorController.java} (90%) rename src/com/android/settings/accessibility/{CaptionEdgeTypeController.java => CaptioningEdgeTypeController.java} (88%) rename src/com/android/settings/accessibility/{CaptionFontSizeController.java => CaptioningFontSizeController.java} (91%) rename src/com/android/settings/accessibility/{CaptionFooterPreferenceController.java => CaptioningFooterPreferenceController.java} (83%) rename src/com/android/settings/accessibility/{CaptionForegroundColorController.java => CaptioningForegroundColorController.java} (91%) rename src/com/android/settings/accessibility/{CaptionForegroundOpacityController.java => CaptioningForegroundOpacityController.java} (91%) rename src/com/android/settings/accessibility/{CaptionLocalePreferenceController.java => CaptioningLocalePreferenceController.java} (89%) rename src/com/android/settings/accessibility/{CaptionMoreOptionsFragment.java => CaptioningMoreOptionsFragment.java} (91%) rename src/com/android/settings/accessibility/{CaptionPresetController.java => CaptioningPresetController.java} (90%) rename src/com/android/settings/accessibility/{CaptionPreviewPreferenceController.java => CaptioningPreviewPreferenceController.java} (95%) rename src/com/android/settings/accessibility/{CaptionPropertiesFragment.java => CaptioningPropertiesFragment.java} (91%) rename src/com/android/settings/accessibility/{CaptionTogglePreferenceController.java => CaptioningTogglePreferenceController.java} (90%) rename src/com/android/settings/accessibility/{CaptionTypefaceController.java => CaptioningTypefaceController.java} (91%) rename src/com/android/settings/accessibility/{CaptionWindowColorController.java => CaptioningWindowColorController.java} (93%) rename src/com/android/settings/accessibility/{CaptionWindowOpacityController.java => CaptioningWindowOpacityController.java} (91%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionAppearanceFragmentTest.java => CaptioningAppearanceFragmentTest.java} (84%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionAppearancePreferenceControllerTest.java => CaptioningAppearancePreferenceControllerTest.java} (96%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionBackgroundColorControllerTest.java => CaptioningBackgroundColorControllerTest.java} (92%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionBackgroundOpacityControllerTest.java => CaptioningBackgroundOpacityControllerTest.java} (94%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionCustomControllerTest.java => CaptioningCustomControllerTest.java} (93%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionEdgeColorControllerTest.java => CaptioningEdgeColorControllerTest.java} (93%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionEdgeTypeControllerTest.java => CaptioningEdgeTypeControllerTest.java} (94%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionFontSizeControllerTest.java => CaptioningFontSizeControllerTest.java} (94%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionForegroundColorControllerTest.java => CaptioningForegroundColorControllerTest.java} (92%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionForegroundOpacityControllerTest.java => CaptioningForegroundOpacityControllerTest.java} (92%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionLocalePreferenceControllerTest.java => CaptioningLocalePreferenceControllerTest.java} (91%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionMoreOptionsFragmentTest.java => CaptioningMoreOptionsFragmentTest.java} (84%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionPresetControllerTest.java => CaptioningPresetControllerTest.java} (94%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionPreviewPreferenceControllerTest.java => CaptioningPreviewPreferenceControllerTest.java} (91%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionPropertiesFragmentTest.java => CaptioningPropertiesFragmentTest.java} (84%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionTogglePreferenceControllerTest.java => CaptioningTogglePreferenceControllerTest.java} (95%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionTypefaceControllerTest.java => CaptioningTypefaceControllerTest.java} (94%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionWindowColorControllerTest.java => CaptioningWindowColorControllerTest.java} (93%) rename tests/robotests/src/com/android/settings/accessibility/{CaptionWindowOpacityControllerTest.java => CaptioningWindowOpacityControllerTest.java} (93%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f94b6ba5dbb..e85d68611f5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2110,7 +2110,7 @@ + android:value="com.android.settings.accessibility.CaptioningPropertiesFragment" /> 8dp - - 48dp + + 48dp 56dip diff --git a/res/values/strings.xml b/res/values/strings.xml index 067e43d53fb..fd186af6532 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5599,20 +5599,20 @@ About color inversion Learn more about color inversion - - Show captions - - For supported app only - - Caption size and style - - %1$s text size - + + Show captions + + For supported app only + + Caption size and style + + %1$s text size + More options - - Customize caption size and style to make them easier to read - - These caption preferences aren\u2019t supported by all media apps + + Customize caption size and style to make them easier to read + + These caption preferences aren\u2019t supported by all media apps Accessibility button @@ -5793,7 +5793,7 @@ Edge type Font family - + Captions will look like this Aa diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 0287fc65d2d..caba41588b7 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -119,10 +119,9 @@ settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/> diff --git a/res/xml/captioning_appearance.xml b/res/xml/captioning_appearance.xml index fa574d1ff04..d8220efa494 100644 --- a/res/xml/captioning_appearance.xml +++ b/res/xml/captioning_appearance.xml @@ -18,15 +18,15 @@ + android:title="@string/captioning_appearance_title"> + settings:controller="com.android.settings.accessibility.CaptioningPreviewPreferenceController"/> + settings:controller="com.android.settings.accessibility.CaptioningFontSizeController"/> + settings:controller="com.android.settings.accessibility.CaptioningPresetController"/> + settings:controller="com.android.settings.accessibility.CaptioningCustomController"> + settings:controller="com.android.settings.accessibility.CaptioningTypefaceController"/> + settings:controller="com.android.settings.accessibility.CaptioningForegroundColorController"/> + settings:controller="com.android.settings.accessibility.CaptioningForegroundOpacityController"/> + settings:controller="com.android.settings.accessibility.CaptioningEdgeTypeController"/> + settings:controller="com.android.settings.accessibility.CaptioningEdgeColorController"/> + settings:controller="com.android.settings.accessibility.CaptioningBackgroundColorController"/> + settings:controller="com.android.settings.accessibility.CaptioningBackgroundOpacityController"/> + settings:controller="com.android.settings.accessibility.CaptioningWindowColorController"/> + settings:controller="com.android.settings.accessibility.CaptioningWindowOpacityController"/> + settings:controller="com.android.settings.accessibility.CaptioningFooterPreferenceController"/> diff --git a/res/xml/captioning_more_options.xml b/res/xml/captioning_more_options.xml index e1fd002bf57..42c106b6868 100644 --- a/res/xml/captioning_more_options.xml +++ b/res/xml/captioning_more_options.xml @@ -24,14 +24,13 @@ android:key="captioning_locale" android:summary="%s" android:title="@string/captioning_locale" - settings:controller="com.android.settings.accessibility.CaptionLocalePreferenceController"/> + settings:controller="com.android.settings.accessibility.CaptioningLocalePreferenceController"/> + settings:controller="com.android.settings.accessibility.CaptioningFooterPreferenceController"/> diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml index 806a256a69f..7fcc03d09c6 100644 --- a/res/xml/captioning_settings.xml +++ b/res/xml/captioning_settings.xml @@ -18,46 +18,39 @@ + android:key="captioning_intro" + android:title="@string/accessibility_captioning_preference_intro"/> + android:title="@string/accessibility_captioning_primary_switch_title" + settings:controller="com.android.settings.accessibility.CaptioningTogglePreferenceController"/> + android:fragment="com.android.settings.accessibility.CaptioningAppearanceFragment" + android:key="captioning_appearance" + android:title="@string/captioning_appearance_title" + settings:controller="com.android.settings.accessibility.CaptioningAppearancePreferenceController" /> + settings:controller="com.android.settings.accessibility.CaptioningFooterPreferenceController"/> diff --git a/src/com/android/settings/accessibility/CaptionHelper.java b/src/com/android/settings/accessibility/CaptionHelper.java index 453049325b2..36d833c4876 100644 --- a/src/com/android/settings/accessibility/CaptionHelper.java +++ b/src/com/android/settings/accessibility/CaptionHelper.java @@ -93,7 +93,7 @@ public class CaptionHelper { previewText.setTextSize(virtualHeight * LINE_HEIGHT_RATIO * fontScale); } else { final float textSize = mContext.getResources().getDimension( - R.dimen.caption_preview_text_size); + R.dimen.captioning_preview_text_size); previewText.setTextSize(textSize * fontScale); } diff --git a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java b/src/com/android/settings/accessibility/CaptioningAppearanceFragment.java similarity index 92% rename from src/com/android/settings/accessibility/CaptionAppearanceFragment.java rename to src/com/android/settings/accessibility/CaptioningAppearanceFragment.java index 7230cbccf87..8b80de3528b 100644 --- a/src/com/android/settings/accessibility/CaptionAppearanceFragment.java +++ b/src/com/android/settings/accessibility/CaptioningAppearanceFragment.java @@ -25,9 +25,9 @@ import com.android.settingslib.search.SearchIndexable; /** Settings fragment containing font style of captioning properties. */ @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) -public class CaptionAppearanceFragment extends DashboardFragment { +public class CaptioningAppearanceFragment extends DashboardFragment { - private static final String TAG = "CaptionAppearanceFragment"; + private static final String TAG = "CaptioningAppearanceFragment"; @Override public int getMetricsCategory() { diff --git a/src/com/android/settings/accessibility/CaptionAppearancePreferenceController.java b/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java similarity index 92% rename from src/com/android/settings/accessibility/CaptionAppearancePreferenceController.java rename to src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java index 4bcdceb208f..74cb534805e 100644 --- a/src/com/android/settings/accessibility/CaptionAppearancePreferenceController.java +++ b/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java @@ -25,12 +25,12 @@ import com.android.settings.core.BasePreferenceController; import com.google.common.primitives.Floats; import com.google.common.primitives.Ints; -/** Controller that shows the caption scale and style summary. */ -public class CaptionAppearancePreferenceController extends BasePreferenceController { +/** Controller that shows the captioning scale and style summary. */ +public class CaptioningAppearancePreferenceController extends BasePreferenceController { private final CaptioningManager mCaptioningManager; - public CaptionAppearancePreferenceController(Context context, String preferenceKey) { + public CaptioningAppearancePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptioningManager = context.getSystemService(CaptioningManager.class); } diff --git a/src/com/android/settings/accessibility/CaptionBackgroundColorController.java b/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java similarity index 92% rename from src/com/android/settings/accessibility/CaptionBackgroundColorController.java rename to src/com/android/settings/accessibility/CaptioningBackgroundColorController.java index f477c9c1e0d..ff093d5af7c 100644 --- a/src/com/android/settings/accessibility/CaptionBackgroundColorController.java +++ b/src/com/android/settings/accessibility/CaptioningBackgroundColorController.java @@ -26,13 +26,13 @@ import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption background color. */ -public class CaptionBackgroundColorController extends BasePreferenceController +/** Preference controller for captioning background color. */ +public class CaptioningBackgroundColorController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionBackgroundColorController(Context context, String preferenceKey) { + public CaptioningBackgroundColorController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionBackgroundOpacityController.java b/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionBackgroundOpacityController.java rename to src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java index 5aeb1ddcc5e..405f6d9fac9 100644 --- a/src/com/android/settings/accessibility/CaptionBackgroundOpacityController.java +++ b/src/com/android/settings/accessibility/CaptioningBackgroundOpacityController.java @@ -25,13 +25,13 @@ import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption background opacity. */ -public class CaptionBackgroundOpacityController extends BasePreferenceController +/** Preference controller for captioning background opacity. */ +public class CaptioningBackgroundOpacityController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionBackgroundOpacityController(Context context, String preferenceKey) { + public CaptioningBackgroundOpacityController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionCustomController.java b/src/com/android/settings/accessibility/CaptioningCustomController.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionCustomController.java rename to src/com/android/settings/accessibility/CaptioningCustomController.java index 23ef73841f8..28a99a7d254 100644 --- a/src/com/android/settings/accessibility/CaptionCustomController.java +++ b/src/com/android/settings/accessibility/CaptioningCustomController.java @@ -35,8 +35,8 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.util.Arrays; import java.util.List; -/** Preference controller for caption custom visibility. */ -public class CaptionCustomController extends BasePreferenceController +/** Preference controller for captioning custom visibility. */ +public class CaptioningCustomController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop { private Preference mCustom; @@ -49,7 +49,7 @@ public class CaptionCustomController extends BasePreferenceController Settings.Secure.ACCESSIBILITY_CAPTIONING_PRESET ); - public CaptionCustomController(Context context, String preferenceKey) { + public CaptioningCustomController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); mContentResolver = context.getContentResolver(); @@ -60,7 +60,7 @@ public class CaptionCustomController extends BasePreferenceController } @VisibleForTesting - CaptionCustomController(Context context, String preferenceKey, + CaptioningCustomController(Context context, String preferenceKey, AccessibilitySettingsContentObserver contentObserver) { this(context, preferenceKey); mSettingsContentObserver = contentObserver; diff --git a/src/com/android/settings/accessibility/CaptionEdgeColorController.java b/src/com/android/settings/accessibility/CaptioningEdgeColorController.java similarity index 90% rename from src/com/android/settings/accessibility/CaptionEdgeColorController.java rename to src/com/android/settings/accessibility/CaptioningEdgeColorController.java index 22359947234..4903ff4deab 100644 --- a/src/com/android/settings/accessibility/CaptionEdgeColorController.java +++ b/src/com/android/settings/accessibility/CaptioningEdgeColorController.java @@ -25,13 +25,13 @@ import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption edge color. */ -public class CaptionEdgeColorController extends BasePreferenceController +/** Preference controller for captioning edge color. */ +public class CaptioningEdgeColorController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionEdgeColorController(Context context, String preferenceKey) { + public CaptioningEdgeColorController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionEdgeTypeController.java b/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java similarity index 88% rename from src/com/android/settings/accessibility/CaptionEdgeTypeController.java rename to src/com/android/settings/accessibility/CaptioningEdgeTypeController.java index 031dfaa7431..adb66d34c17 100644 --- a/src/com/android/settings/accessibility/CaptionEdgeTypeController.java +++ b/src/com/android/settings/accessibility/CaptioningEdgeTypeController.java @@ -23,13 +23,13 @@ import androidx.preference.PreferenceScreen; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption edge type. */ -public class CaptionEdgeTypeController extends BasePreferenceController +/** Preference controller for captioning edge type. */ +public class CaptioningEdgeTypeController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionEdgeTypeController(Context context, String preferenceKey) { + public CaptioningEdgeTypeController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionFontSizeController.java b/src/com/android/settings/accessibility/CaptioningFontSizeController.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionFontSizeController.java rename to src/com/android/settings/accessibility/CaptioningFontSizeController.java index a8fee3882a4..196117b132f 100644 --- a/src/com/android/settings/accessibility/CaptionFontSizeController.java +++ b/src/com/android/settings/accessibility/CaptioningFontSizeController.java @@ -27,14 +27,14 @@ import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption font size. */ -public class CaptionFontSizeController extends BasePreferenceController +/** Preference controller for captioning font size. */ +public class CaptioningFontSizeController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { private final CaptioningManager mCaptioningManager; private final CaptionHelper mCaptionHelper; - public CaptionFontSizeController(Context context, String preferenceKey) { + public CaptioningFontSizeController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptioningManager = context.getSystemService(CaptioningManager.class); mCaptionHelper = new CaptionHelper(context); diff --git a/src/com/android/settings/accessibility/CaptionFooterPreferenceController.java b/src/com/android/settings/accessibility/CaptioningFooterPreferenceController.java similarity index 83% rename from src/com/android/settings/accessibility/CaptionFooterPreferenceController.java rename to src/com/android/settings/accessibility/CaptioningFooterPreferenceController.java index b81b99d2d96..def56209fca 100644 --- a/src/com/android/settings/accessibility/CaptionFooterPreferenceController.java +++ b/src/com/android/settings/accessibility/CaptioningFooterPreferenceController.java @@ -20,12 +20,10 @@ import android.content.Context; import com.android.settings.R; -/** - * Preference controller for caption footer. - */ -public class CaptionFooterPreferenceController extends AccessibilityFooterPreferenceController { +/** Preference controller for captioning footer. */ +public class CaptioningFooterPreferenceController extends AccessibilityFooterPreferenceController { - public CaptionFooterPreferenceController(Context context, String key) { + public CaptioningFooterPreferenceController(Context context, String key) { super(context, key); } diff --git a/src/com/android/settings/accessibility/CaptionForegroundColorController.java b/src/com/android/settings/accessibility/CaptioningForegroundColorController.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionForegroundColorController.java rename to src/com/android/settings/accessibility/CaptioningForegroundColorController.java index b8618f353d7..c867732722f 100644 --- a/src/com/android/settings/accessibility/CaptionForegroundColorController.java +++ b/src/com/android/settings/accessibility/CaptioningForegroundColorController.java @@ -25,13 +25,13 @@ import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption foreground color. */ -public class CaptionForegroundColorController extends BasePreferenceController +/** Preference controller for captioning foreground color. */ +public class CaptioningForegroundColorController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionForegroundColorController(Context context, String preferenceKey) { + public CaptioningForegroundColorController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionForegroundOpacityController.java b/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionForegroundOpacityController.java rename to src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java index 7f31704a07c..ab8a84b380f 100644 --- a/src/com/android/settings/accessibility/CaptionForegroundOpacityController.java +++ b/src/com/android/settings/accessibility/CaptioningForegroundOpacityController.java @@ -25,13 +25,13 @@ import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption foreground opacity. */ -public class CaptionForegroundOpacityController extends BasePreferenceController +/** Preference controller for captioning foreground opacity. */ +public class CaptioningForegroundOpacityController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionForegroundOpacityController(Context context, String preferenceKey) { + public CaptioningForegroundOpacityController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionLocalePreferenceController.java b/src/com/android/settings/accessibility/CaptioningLocalePreferenceController.java similarity index 89% rename from src/com/android/settings/accessibility/CaptionLocalePreferenceController.java rename to src/com/android/settings/accessibility/CaptioningLocalePreferenceController.java index 7566282efff..8662bccf66b 100644 --- a/src/com/android/settings/accessibility/CaptionLocalePreferenceController.java +++ b/src/com/android/settings/accessibility/CaptioningLocalePreferenceController.java @@ -25,13 +25,13 @@ import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -/** Controller that shows the caption locale summary. */ -public class CaptionLocalePreferenceController extends BasePreferenceController +/** Controller that shows the captioning locale summary. */ +public class CaptioningLocalePreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { private final CaptioningManager mCaptioningManager; - public CaptionLocalePreferenceController(Context context, String preferenceKey) { + public CaptioningLocalePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptioningManager = context.getSystemService(CaptioningManager.class); } diff --git a/src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java b/src/com/android/settings/accessibility/CaptioningMoreOptionsFragment.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java rename to src/com/android/settings/accessibility/CaptioningMoreOptionsFragment.java index 3e6b8aadb1d..2895e751c26 100644 --- a/src/com/android/settings/accessibility/CaptionMoreOptionsFragment.java +++ b/src/com/android/settings/accessibility/CaptioningMoreOptionsFragment.java @@ -25,9 +25,9 @@ import com.android.settingslib.search.SearchIndexable; /** Settings fragment containing more options of captioning properties. */ @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) -public class CaptionMoreOptionsFragment extends DashboardFragment { +public class CaptioningMoreOptionsFragment extends DashboardFragment { - private static final String TAG = "CaptionMoreOptionsFragment"; + private static final String TAG = "CaptioningMoreOptionsFragment"; @Override public int getMetricsCategory() { diff --git a/src/com/android/settings/accessibility/CaptionPresetController.java b/src/com/android/settings/accessibility/CaptioningPresetController.java similarity index 90% rename from src/com/android/settings/accessibility/CaptionPresetController.java rename to src/com/android/settings/accessibility/CaptioningPresetController.java index db21f0b29b6..f08a5f49cfd 100644 --- a/src/com/android/settings/accessibility/CaptionPresetController.java +++ b/src/com/android/settings/accessibility/CaptioningPresetController.java @@ -24,13 +24,13 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption preset. */ -public class CaptionPresetController extends BasePreferenceController +/** Preference controller for captioning preset. */ +public class CaptioningPresetController extends BasePreferenceController implements ListDialogPreference.OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionPresetController(Context context, String preferenceKey) { + public CaptioningPresetController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionPreviewPreferenceController.java b/src/com/android/settings/accessibility/CaptioningPreviewPreferenceController.java similarity index 95% rename from src/com/android/settings/accessibility/CaptionPreviewPreferenceController.java rename to src/com/android/settings/accessibility/CaptioningPreviewPreferenceController.java index 793eaa30df7..73ee8469116 100644 --- a/src/com/android/settings/accessibility/CaptionPreviewPreferenceController.java +++ b/src/com/android/settings/accessibility/CaptioningPreviewPreferenceController.java @@ -39,8 +39,8 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -/** Controller that shows the caption locale summary. */ -public class CaptionPreviewPreferenceController extends BasePreferenceController +/** Controller that shows the captioning locale summary. */ +public class CaptioningPreviewPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop { @VisibleForTesting @@ -60,7 +60,7 @@ public class CaptionPreviewPreferenceController extends BasePreferenceController private CaptionHelper mCaptionHelper; private LayoutPreference mPreference; - public CaptionPreviewPreferenceController(Context context, String preferenceKey) { + public CaptioningPreviewPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); mSettingsContentObserver = new AccessibilitySettingsContentObserver(mHandler); diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptioningPropertiesFragment.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionPropertiesFragment.java rename to src/com/android/settings/accessibility/CaptioningPropertiesFragment.java index 697c8fb9a3c..95a3307b198 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptioningPropertiesFragment.java @@ -25,9 +25,9 @@ import com.android.settingslib.search.SearchIndexable; /** Settings fragment containing captioning properties. */ @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) -public class CaptionPropertiesFragment extends DashboardFragment { +public class CaptioningPropertiesFragment extends DashboardFragment { - private static final String TAG = "CaptionPropertiesFragment"; + private static final String TAG = "CaptioningPropertiesFragment"; @Override public int getMetricsCategory() { diff --git a/src/com/android/settings/accessibility/CaptionTogglePreferenceController.java b/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java similarity index 90% rename from src/com/android/settings/accessibility/CaptionTogglePreferenceController.java rename to src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java index b85200209fd..a9d2cdfafb9 100644 --- a/src/com/android/settings/accessibility/CaptionTogglePreferenceController.java +++ b/src/com/android/settings/accessibility/CaptioningTogglePreferenceController.java @@ -26,13 +26,13 @@ import com.android.settings.core.TogglePreferenceController; import com.android.settings.widget.SettingsMainSwitchPreference; import com.android.settingslib.widget.OnMainSwitchChangeListener; -/** Preference controller for caption more options. */ -public class CaptionTogglePreferenceController extends TogglePreferenceController +/** Preference controller for captioning more options. */ +public class CaptioningTogglePreferenceController extends TogglePreferenceController implements OnMainSwitchChangeListener { private final CaptionHelper mCaptionHelper; - public CaptionTogglePreferenceController(Context context, String preferenceKey) { + public CaptioningTogglePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionTypefaceController.java b/src/com/android/settings/accessibility/CaptioningTypefaceController.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionTypefaceController.java rename to src/com/android/settings/accessibility/CaptioningTypefaceController.java index 5e452d916ef..3876d391721 100644 --- a/src/com/android/settings/accessibility/CaptionTypefaceController.java +++ b/src/com/android/settings/accessibility/CaptioningTypefaceController.java @@ -27,13 +27,13 @@ import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption type face. */ -public class CaptionTypefaceController extends BasePreferenceController +/** Preference controller for captioning type face. */ +public class CaptioningTypefaceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { private final CaptionHelper mCaptionHelper; - public CaptionTypefaceController(Context context, String preferenceKey) { + public CaptioningTypefaceController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionWindowColorController.java b/src/com/android/settings/accessibility/CaptioningWindowColorController.java similarity index 93% rename from src/com/android/settings/accessibility/CaptionWindowColorController.java rename to src/com/android/settings/accessibility/CaptioningWindowColorController.java index f13a3477930..ce68227ed8d 100644 --- a/src/com/android/settings/accessibility/CaptionWindowColorController.java +++ b/src/com/android/settings/accessibility/CaptioningWindowColorController.java @@ -26,13 +26,13 @@ import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption window color. */ -public class CaptionWindowColorController extends BasePreferenceController +/** Preference controller for captioning window color. */ +public class CaptioningWindowColorController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionWindowColorController(Context context, String preferenceKey) { + public CaptioningWindowColorController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/accessibility/CaptionWindowOpacityController.java b/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java similarity index 91% rename from src/com/android/settings/accessibility/CaptionWindowOpacityController.java rename to src/com/android/settings/accessibility/CaptioningWindowOpacityController.java index 8076a48d9a2..ef288039780 100644 --- a/src/com/android/settings/accessibility/CaptionWindowOpacityController.java +++ b/src/com/android/settings/accessibility/CaptioningWindowOpacityController.java @@ -25,13 +25,13 @@ import com.android.settings.R; import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener; import com.android.settings.core.BasePreferenceController; -/** Preference controller for caption window opacity. */ -public class CaptionWindowOpacityController extends BasePreferenceController +/** Preference controller for captioning window opacity. */ +public class CaptioningWindowOpacityController extends BasePreferenceController implements OnValueChangedListener { private final CaptionHelper mCaptionHelper; - public CaptionWindowOpacityController(Context context, String preferenceKey) { + public CaptioningWindowOpacityController(Context context, String preferenceKey) { super(context, preferenceKey); mCaptionHelper = new CaptionHelper(context); } diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index dc746ce8e64..5e17e0b8bf9 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -28,7 +28,7 @@ import com.android.settings.TrustedCredentialsSettings; import com.android.settings.accessibility.AccessibilityDetailsSettingsFragment; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard; -import com.android.settings.accessibility.CaptionPropertiesFragment; +import com.android.settings.accessibility.CaptioningPropertiesFragment; import com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard; import com.android.settings.accessibility.ToggleColorInversionPreferenceFragment; import com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment; @@ -230,7 +230,7 @@ public class SettingsGateway { AccessibilitySettings.class.getName(), AccessibilitySettingsForSetupWizard.class.getName(), TextReadingPreferenceFragmentForSetupWizard.class.getName(), - CaptionPropertiesFragment.class.getName(), + CaptioningPropertiesFragment.class.getName(), ToggleDaltonizerPreferenceFragment.class.getName(), ToggleColorInversionPreferenceFragment.class.getName(), ToggleReduceBrightColorsPreferenceFragment.class.getName(), diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java index 4700ecdfd27..c1a1799b6bc 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptionHelperTest.java @@ -92,7 +92,7 @@ public class CaptionHelperTest { final float fontScale = 1.0f; when(mCaptioningManager.getFontScale()).thenReturn(fontScale); final float textSize = mContext.getResources().getDimension( - R.dimen.caption_preview_text_size) * fontScale; + R.dimen.captioning_preview_text_size) * fontScale; mCaptionHelper.applyCaptionProperties(mSubtitleView, /* PreviewWindow= */ null, /* styleId= */ 0); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionAppearanceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearanceFragmentTest.java similarity index 84% rename from tests/robotests/src/com/android/settings/accessibility/CaptionAppearanceFragmentTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningAppearanceFragmentTest.java index b180f228634..c839a017c22 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionAppearanceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearanceFragmentTest.java @@ -33,16 +33,16 @@ import org.robolectric.RobolectricTestRunner; import java.util.List; -/** Tests for {@link CaptionAppearanceFragment}. */ +/** Tests for {@link CaptioningAppearanceFragment}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionAppearanceFragmentTest { +public class CaptioningAppearanceFragmentTest { private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionAppearanceFragment mFragment; + private CaptioningAppearanceFragment mFragment; @Before public void setUp() { - mFragment = new CaptionAppearanceFragment(); + mFragment = new CaptioningAppearanceFragment(); } @Test @@ -58,7 +58,7 @@ public class CaptionAppearanceFragmentTest { @Test public void getLogTag_returnsCorrectTag() { - assertThat(mFragment.getLogTag()).isEqualTo("CaptionAppearanceFragment"); + assertThat(mFragment.getLogTag()).isEqualTo("CaptioningAppearanceFragment"); } @Test @@ -68,7 +68,7 @@ public class CaptionAppearanceFragmentTest { @Test public void getNonIndexableKeys_existInXmlLayout() { - final List niks = CaptionAppearanceFragment.SEARCH_INDEX_DATA_PROVIDER + final List niks = CaptioningAppearanceFragment.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(mContext); final List keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.captioning_appearance); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionAppearancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java similarity index 96% rename from tests/robotests/src/com/android/settings/accessibility/CaptionAppearancePreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java index cfa683bab04..74fb440358b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionAppearancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java @@ -34,23 +34,23 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionAppearancePreferenceController}. */ +/** Tests for {@link CaptioningAppearancePreferenceController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionAppearancePreferenceControllerTest { +public class CaptioningAppearancePreferenceControllerTest { private static final String TEST_KEY = "test_key"; private static final int DEFAULT_PRESET_INDEX = 1; private static final int DEFAULT_FONT_SCALE_INDEX = 2; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionAppearancePreferenceController mController; + private CaptioningAppearancePreferenceController mController; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { CaptioningManager captioningManager = mContext.getSystemService(CaptioningManager.class); mShadowCaptioningManager = Shadow.extract(captioningManager); - mController = new CaptionAppearancePreferenceController(mContext, TEST_KEY); + mController = new CaptioningAppearancePreferenceController(mContext, TEST_KEY); } @Test diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionBackgroundColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java similarity index 92% rename from tests/robotests/src/com/android/settings/accessibility/CaptionBackgroundColorControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java index 964e240d658..2ecaa0f3f29 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionBackgroundColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundColorControllerTest.java @@ -45,22 +45,23 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionBackgroundColorController}. */ +/** Tests for {@link CaptioningBackgroundColorController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionBackgroundColorControllerTest { +public class CaptioningBackgroundColorControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionBackgroundColorController mController; + private CaptioningBackgroundColorController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionBackgroundColorController(mContext, "captioning_background_color"); + mController = new CaptioningBackgroundColorController(mContext, + "captioning_background_color"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionBackgroundOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/accessibility/CaptionBackgroundOpacityControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java index 3c5e247680c..56a61ecff79 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionBackgroundOpacityControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningBackgroundOpacityControllerTest.java @@ -47,21 +47,21 @@ import org.robolectric.shadows.ShadowCaptioningManager; /** Tests for {@link CaptionBackgroundOpacityController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionBackgroundOpacityControllerTest { +public class CaptioningBackgroundOpacityControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionBackgroundOpacityController mController; + private CaptioningBackgroundOpacityController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = - new CaptionBackgroundOpacityController(mContext, "captioning_background_opacity"); + mController = new CaptioningBackgroundOpacityController(mContext, + "captioning_background_opacity"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionCustomControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java similarity index 93% rename from tests/robotests/src/com/android/settings/accessibility/CaptionCustomControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java index 783a9fc2725..838d9e04b7b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionCustomControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningCustomControllerTest.java @@ -41,9 +41,9 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; -/** Tests for {@link CaptionCustomController}. */ +/** Tests for {@link CaptioningCustomController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionCustomControllerTest { +public class CaptioningCustomControllerTest { private static final String PREF_KEY = "custom"; @@ -55,13 +55,13 @@ public class CaptionCustomControllerTest { private AccessibilitySettingsContentObserver mAccessibilitySettingsContentObserver; private final Context mContext = ApplicationProvider.getApplicationContext(); private ContentResolver mContentResolver; - private CaptionCustomController mController; + private CaptioningCustomController mController; private Preference mPreference; @Before public void setUp() { mContentResolver = mContext.getContentResolver(); - mController = new CaptionCustomController(mContext, PREF_KEY, + mController = new CaptioningCustomController(mContext, PREF_KEY, mAccessibilitySettingsContentObserver); mPreference = new Preference(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionEdgeColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java similarity index 93% rename from tests/robotests/src/com/android/settings/accessibility/CaptionEdgeColorControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java index fd4e55ad52d..f1a8566183f 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionEdgeColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeColorControllerTest.java @@ -45,21 +45,21 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionEdgeColorController}. */ +/** Tests for {@link CaptioningEdgeColorController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionEdgeColorControllerTest { +public class CaptioningEdgeColorControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionEdgeColorController mController; + private CaptioningEdgeColorController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionEdgeColorController(mContext, "captioning_edge_color"); + mController = new CaptioningEdgeColorController(mContext, "captioning_edge_color"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionEdgeTypeControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/accessibility/CaptionEdgeTypeControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java index fba7afaa873..11871f8c70f 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionEdgeTypeControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningEdgeTypeControllerTest.java @@ -46,22 +46,22 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionEdgeTypeController}. */ +/** Tests for {@link CaptioningEdgeTypeController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionEdgeTypeControllerTest { +public class CaptioningEdgeTypeControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionEdgeTypeController mController; + private CaptioningEdgeTypeController mController; private EdgeTypePreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionEdgeTypeController(mContext, "captioning_edge_type"); + mController = new CaptioningEdgeTypeController(mContext, "captioning_edge_type"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new EdgeTypePreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionFontSizeControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/accessibility/CaptionFontSizeControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java index c4033ef5d39..c20cf5dcb84 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionFontSizeControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningFontSizeControllerTest.java @@ -45,22 +45,22 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionFontSizeController}. */ +/** Tests for {@link CaptioningFontSizeController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionFontSizeControllerTest { +public class CaptioningFontSizeControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionFontSizeController mController; + private CaptioningFontSizeController mController; private ListPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionFontSizeController(mContext, "captioning_font_size"); + mController = new CaptioningFontSizeController(mContext, "captioning_font_size"); mPreference = new ListPreference(mContext); mPreference.setEntries(R.array.captioning_font_size_selector_titles); mPreference.setEntryValues(R.array.captioning_font_size_selector_values); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionForegroundColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java similarity index 92% rename from tests/robotests/src/com/android/settings/accessibility/CaptionForegroundColorControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java index 50ce90d5a9e..9c64130d4df 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionForegroundColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundColorControllerTest.java @@ -45,22 +45,23 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionForegroundColorController}. */ +/** Tests for {@link CaptioningForegroundColorController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionForegroundColorControllerTest { +public class CaptioningForegroundColorControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionForegroundColorController mController; + private CaptioningForegroundColorController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionForegroundColorController(mContext, "captioning_foreground_color"); + mController = new CaptioningForegroundColorController(mContext, + "captioning_foreground_color"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionForegroundOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java similarity index 92% rename from tests/robotests/src/com/android/settings/accessibility/CaptionForegroundOpacityControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java index 38cecd65593..1ffff60a201 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionForegroundOpacityControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningForegroundOpacityControllerTest.java @@ -45,23 +45,23 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionForegroundOpacityController}. */ +/** Tests for {@link CaptioningForegroundOpacityController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionForegroundOpacityControllerTest { +public class CaptioningForegroundOpacityControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionForegroundOpacityController mController; + private CaptioningForegroundOpacityController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = - new CaptionForegroundOpacityController(mContext, "captioning_foreground_opacity"); + mController = new CaptioningForegroundOpacityController(mContext, + "captioning_foreground_opacity"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionLocalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningLocalePreferenceControllerTest.java similarity index 91% rename from tests/robotests/src/com/android/settings/accessibility/CaptionLocalePreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningLocalePreferenceControllerTest.java index cb0d67c1c88..97c1908ff76 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionLocalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningLocalePreferenceControllerTest.java @@ -38,21 +38,21 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; -/** Tests for {@link CaptionLocalePreferenceController}. */ +/** Tests for {@link CaptioningLocalePreferenceController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionLocalePreferenceControllerTest { +public class CaptioningLocalePreferenceControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionLocalePreferenceController mController; + private CaptioningLocalePreferenceController mController; private LocalePreference mPreference; @Before public void setUp() { - mController = new CaptionLocalePreferenceController(mContext, "captioning_local_pref"); + mController = new CaptioningLocalePreferenceController(mContext, "captioning_local_pref"); mPreference = new LocalePreference(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionMoreOptionsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningMoreOptionsFragmentTest.java similarity index 84% rename from tests/robotests/src/com/android/settings/accessibility/CaptionMoreOptionsFragmentTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningMoreOptionsFragmentTest.java index 8d1c6848bd7..6969472b485 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionMoreOptionsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningMoreOptionsFragmentTest.java @@ -33,16 +33,16 @@ import org.robolectric.RobolectricTestRunner; import java.util.List; -/** Tests for {@link CaptionMoreOptionsFragment}. */ +/** Tests for {@link CaptioningMoreOptionsFragment}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionMoreOptionsFragmentTest { +public class CaptioningMoreOptionsFragmentTest { private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionMoreOptionsFragment mFragment; + private CaptioningMoreOptionsFragment mFragment; @Before public void setUp() { - mFragment = new CaptionMoreOptionsFragment(); + mFragment = new CaptioningMoreOptionsFragment(); } @Test @@ -59,12 +59,12 @@ public class CaptionMoreOptionsFragmentTest { @Test public void getLogTag_returnsCorrectTag() { - assertThat(mFragment.getLogTag()).isEqualTo("CaptionMoreOptionsFragment"); + assertThat(mFragment.getLogTag()).isEqualTo("CaptioningMoreOptionsFragment"); } @Test public void getNonIndexableKeys_existInXmlLayout() { - final List niks = CaptionMoreOptionsFragment.SEARCH_INDEX_DATA_PROVIDER + final List niks = CaptioningMoreOptionsFragment.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(mContext); final List keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java index 0dbb347227b..c44bed11819 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java @@ -16,6 +16,9 @@ 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.google.common.truth.Truth.assertThat; import android.content.Context; @@ -30,10 +33,9 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +/** Tests for {@link CaptioningPreferenceController}. */ @RunWith(RobolectricTestRunner.class) public class CaptioningPreferenceControllerTest { - private static final int ON = 1; - private static final int OFF = 0; private Context mContext; private CaptioningPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionPresetControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningPresetControllerTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/accessibility/CaptionPresetControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningPresetControllerTest.java index 0b832d3f1b0..c91baa20eb4 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionPresetControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningPresetControllerTest.java @@ -46,22 +46,22 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionPresetController}. */ +/** Tests for {@link CaptioningPresetController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionPresetControllerTest { +public class CaptioningPresetControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionPresetController mController; + private CaptioningPresetController mController; private PresetPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionPresetController(mContext, "captioning_preset"); + mController = new CaptioningPresetController(mContext, "captioning_preset"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new PresetPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionPreviewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningPreviewPreferenceControllerTest.java similarity index 91% rename from tests/robotests/src/com/android/settings/accessibility/CaptionPreviewPreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningPreviewPreferenceControllerTest.java index dda4886ece7..cf87dd8f6f8 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionPreviewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningPreviewPreferenceControllerTest.java @@ -42,9 +42,9 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; -/** Tests for {@link CaptionPreviewPreferenceController}. */ +/** Tests for {@link CaptioningPreviewPreferenceController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionPreviewPreferenceControllerTest { +public class CaptioningPreviewPreferenceControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @@ -54,13 +54,13 @@ public class CaptionPreviewPreferenceControllerTest { private ContentResolver mContentResolver; @Spy private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionPreviewPreferenceController mController; + private CaptioningPreviewPreferenceController mController; private LayoutPreference mLayoutPreference; @Before public void setUp() { when(mContext.getContentResolver()).thenReturn(mContentResolver); - mController = new CaptionPreviewPreferenceController(mContext, + mController = new CaptioningPreviewPreferenceController(mContext, "captioning_preference_switch"); final View view = new View(mContext); mLayoutPreference = new LayoutPreference(mContext, view); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionPropertiesFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningPropertiesFragmentTest.java similarity index 84% rename from tests/robotests/src/com/android/settings/accessibility/CaptionPropertiesFragmentTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningPropertiesFragmentTest.java index cd0638a09c4..4f25139c7e6 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionPropertiesFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningPropertiesFragmentTest.java @@ -33,16 +33,16 @@ import org.robolectric.RobolectricTestRunner; import java.util.List; -/** Tests for {@link CaptionPropertiesFragment}. */ +/** Tests for {@link CaptioningPropertiesFragment}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionPropertiesFragmentTest { +public class CaptioningPropertiesFragmentTest { private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionPropertiesFragment mFragment; + private CaptioningPropertiesFragment mFragment; @Before public void setUp() { - mFragment = new CaptionPropertiesFragment(); + mFragment = new CaptioningPropertiesFragment(); } @Test @@ -59,12 +59,12 @@ public class CaptionPropertiesFragmentTest { @Test public void getLogTag_returnsCorrectTag() { - assertThat(mFragment.getLogTag()).isEqualTo("CaptionPropertiesFragment"); + assertThat(mFragment.getLogTag()).isEqualTo("CaptioningPropertiesFragment"); } @Test public void getNonIndexableKeys_existInXmlLayout() { - final List niks = CaptionPropertiesFragment.SEARCH_INDEX_DATA_PROVIDER + final List niks = CaptioningPropertiesFragment.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(mContext); final List keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningTogglePreferenceControllerTest.java similarity index 95% rename from tests/robotests/src/com/android/settings/accessibility/CaptionTogglePreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningTogglePreferenceControllerTest.java index 1980df2acde..cdc17410493 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningTogglePreferenceControllerTest.java @@ -45,22 +45,22 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionTogglePreferenceController}. */ +/** Tests for {@link CaptioningTogglePreferenceController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionTogglePreferenceControllerTest { +public class CaptioningTogglePreferenceControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionTogglePreferenceController mController; + private CaptioningTogglePreferenceController mController; private SettingsMainSwitchPreference mSwitchPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionTogglePreferenceController(mContext, + mController = new CaptioningTogglePreferenceController(mContext, "captioning_preference_switch"); mSwitchPreference = new SettingsMainSwitchPreference(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mSwitchPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionTypefaceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/accessibility/CaptionTypefaceControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java index f2f070ff0bc..0ca455caa17 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionTypefaceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningTypefaceControllerTest.java @@ -45,22 +45,22 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionTypefaceController}. */ +/** Tests for {@link CaptioningTypefaceController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionTypefaceControllerTest { +public class CaptioningTypefaceControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionTypefaceController mController; + private CaptioningTypefaceController mController; private ListPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionTypefaceController(mContext, "captioning_typeface"); + mController = new CaptioningTypefaceController(mContext, "captioning_typeface"); mPreference = new ListPreference(mContext); mPreference.setEntries(R.array.captioning_typeface_selector_titles); mPreference.setEntryValues(R.array.captioning_typeface_selector_values); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionWindowColorControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java similarity index 93% rename from tests/robotests/src/com/android/settings/accessibility/CaptionWindowColorControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java index 66b1666c46d..abfa98d3f3b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionWindowColorControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowColorControllerTest.java @@ -46,22 +46,22 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionWindowColorController}. */ +/** Tests for {@link CaptioningWindowColorController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionWindowColorControllerTest { +public class CaptioningWindowColorControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionWindowColorController mController; + private CaptioningWindowColorController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionWindowColorController(mContext, "captioning_window_color"); + mController = new CaptioningWindowColorController(mContext, "captioning_window_color"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptionWindowOpacityControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java similarity index 93% rename from tests/robotests/src/com/android/settings/accessibility/CaptionWindowOpacityControllerTest.java rename to tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java index 71d37482481..99eb1e5dcfb 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptionWindowOpacityControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningWindowOpacityControllerTest.java @@ -45,22 +45,22 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCaptioningManager; -/** Tests for {@link CaptionWindowOpacityController}. */ +/** Tests for {@link CaptioningWindowOpacityController}. */ @RunWith(RobolectricTestRunner.class) -public class CaptionWindowOpacityControllerTest { +public class CaptioningWindowOpacityControllerTest { @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock private PreferenceScreen mScreen; private final Context mContext = ApplicationProvider.getApplicationContext(); - private CaptionWindowOpacityController mController; + private CaptioningWindowOpacityController mController; private ColorPreference mPreference; private ShadowCaptioningManager mShadowCaptioningManager; @Before public void setUp() { - mController = new CaptionWindowOpacityController(mContext, "captioning_window_opacity"); + mController = new CaptioningWindowOpacityController(mContext, "captioning_window_opacity"); final AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); mPreference = new ColorPreference(mContext, attributeSet); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);