New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (19/n).
- Rename the strings related to "text and display" to "color and motion" to avoid misunderstanding.
Bug: 211503117
Test: manual test
Change-Id: Icdca5ee03fb95a8531406a0f6ab07799a9dfb17c
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 16658f8..ba4d2f6 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -3736,7 +3736,7 @@
errorLine1=" android:color="@color/accessibility_feature_background"/>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
- file="res/drawable/ic_text_and_display.xml"
+ file="res/drawable/ic_color_and_motion.xml"
line="22"
column="13"/>
</issue>
diff --git a/res/drawable/ic_text_and_display.xml b/res/drawable/ic_color_and_motion.xml
similarity index 100%
rename from res/drawable/ic_text_and_display.xml
rename to res/drawable/ic_color_and_motion.xml
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 36e1193..cade521 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5150,8 +5150,8 @@
<string name="general_category_title">General</string>
<!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->
<string name="display_category_title">Display</string>
- <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
- <string name="accessibility_text_and_display_title">Text and display</string>
+ <!-- Title for the accessibility color and motion page. [CHAR LIMIT=50] -->
+ <string name="accessibility_color_and_motion_title">Color and motion</string>
<!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
<string name="accessibility_turn_screen_darker_title">Turn screen darker</string>
<!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
diff --git a/res/xml/accessibility_text_and_display.xml b/res/xml/accessibility_color_and_motion.xml
similarity index 96%
rename from res/xml/accessibility_text_and_display.xml
rename to res/xml/accessibility_color_and_motion.xml
index 659acab..2644802 100644
--- a/res/xml/accessibility_text_and_display.xml
+++ b/res/xml/accessibility_color_and_motion.xml
@@ -17,9 +17,9 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="accessibility_text_and_display"
+ android:key="accessibility_color_and_motion"
android:persistent="false"
- android:title="@string/accessibility_text_and_display_title">
+ android:title="@string/accessibility_color_and_motion_title">
<Preference
android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 8d5ebf6..22226a1 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -44,11 +44,11 @@
android:title="@string/accessibility_text_reading_options_title" />
<Preference
- android:fragment="com.android.settings.accessibility.TextAndDisplayFragment"
- android:key="text_and_display_preference_screen"
- android:icon="@drawable/ic_text_and_display"
+ android:fragment="com.android.settings.accessibility.ColorAndMotionFragment"
+ android:key="color_and_motion"
+ android:icon="@drawable/ic_color_and_motion"
android:persistent="false"
- android:title="@string/accessibility_text_and_display_title"
+ android:title="@string/accessibility_color_and_motion_title"
settings:searchable="true"/>
<com.android.settingslib.PrimarySwitchPreference
diff --git a/src/com/android/settings/accessibility/TextAndDisplayFragment.java b/src/com/android/settings/accessibility/ColorAndMotionFragment.java
similarity index 91%
rename from src/com/android/settings/accessibility/TextAndDisplayFragment.java
rename to src/com/android/settings/accessibility/ColorAndMotionFragment.java
index e81dded..7f55053 100644
--- a/src/com/android/settings/accessibility/TextAndDisplayFragment.java
+++ b/src/com/android/settings/accessibility/ColorAndMotionFragment.java
@@ -30,11 +30,11 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
-/** Accessibility settings for text and display. */
+/** Accessibility settings for color and motion. */
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class TextAndDisplayFragment extends DashboardFragment {
+public class ColorAndMotionFragment extends DashboardFragment {
- private static final String TAG = "TextAndDisplayFragment";
+ private static final String TAG = "ColorAndMotionFragment";
private static final String CATEGORY_EXPERIMENTAL = "experimental_category";
@@ -49,7 +49,7 @@
@Override
public int getMetricsCategory() {
- return SettingsEnums.ACCESSIBILITY_TEXT_AND_DISPLAY;
+ return SettingsEnums.ACCESSIBILITY_COLOR_AND_MOTION;
}
@@ -62,7 +62,7 @@
@Override
protected int getPreferenceScreenResId() {
- return R.xml.accessibility_text_and_display;
+ return R.xml.accessibility_color_and_motion;
}
@Override
@@ -104,5 +104,5 @@
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider(R.xml.accessibility_text_and_display);
+ new BaseSearchIndexProvider(R.xml.accessibility_color_and_motion);
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java
similarity index 89%
rename from tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java
rename to tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java
index 96756ecd..0bb227e 100644
--- a/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java
@@ -32,17 +32,17 @@
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-public class TextAndDisplayFragmentTest {
+public class ColorAndMotionFragmentTest {
private Context mContext = ApplicationProvider.getApplicationContext();
@Test
public void getNonIndexableKeys_existInXmlLayout() {
- final List<String> niks = TextAndDisplayFragment.SEARCH_INDEX_DATA_PROVIDER
+ final List<String> niks = ColorAndMotionFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
final List<String> keys =
XmlTestUtils.getKeysFromPreferenceXml(mContext,
- R.xml.accessibility_text_and_display);
+ R.xml.accessibility_color_and_motion);
assertThat(keys).containsAtLeastElementsIn(niks);
}
