Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e442de authored by menghanli's avatar menghanli
Browse files

Polish humanize strings for color correction page 

- Add intro for purpose or behavior
- Remove correction mode category title
- Reformat deuteranomaly, protanomaly, and tritanomaly title and summary

Bug: 218408547
Test: Manual testing
Change-Id: I0cca0c063ab15b4065c0e3a277181a8cf44a70ce
parent c0f70d6f

res/values/strings.xml

+10 −8
Original line number Diff line number Diff line
@@ -5509,6 +5509,10 @@ 
    <string name="accessibility_service_quick_settings_tooltips_content"><xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g> added to Quick Settings. Swipe down to turn it on or off anytime.</string>

    <!-- Used in the accessibility action for accessibility quick settings tooltips to dismiss. [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_tooltips_dismiss">Dismiss</string>

    <!-- Intro for color correction settings screen to control turning on/off the feature entirely. [CHAR LIMIT=NONE] -->

    <string name="accessibility_daltonizer_about_intro_text" product="default">Adjust how colors display on your phone</string>

    <!-- Intro for color correction settings screen to control turning on/off the feature entirely. [CHAR LIMIT=NONE] -->

    <string name="accessibility_daltonizer_about_intro_text" product="tablet">Adjust how colors display on your tablet</string>

    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->

    <string name="accessibility_daltonizer_primary_switch_title">Use color correction</string>

    <!-- Title for accessibility shortcut preference for color correction. [CHAR LIMIT=60] -->
@@ -5588,22 +5592,20 @@ 








    <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->









    <string name="enable_quick_setting">Show in Quick Settings</string>









    <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->









    <string name="daltonizer_type">Correction mode</string>









    <!-- Title shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->









    <string name="daltonizer_mode_deuteranomaly_title">Deuteranomaly</string>









    <string name="daltonizer_mode_deuteranomaly_title">Red-green</string>









    <!-- Title shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->









    <string name="daltonizer_mode_protanomaly_title">Protanomaly</string>









    <string name="daltonizer_mode_protanomaly_title">Red-green</string>









    <!-- Title shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->









    <string name="daltonizer_mode_tritanomaly_title">Tritanomaly</string>









    <string name="daltonizer_mode_tritanomaly_title">Blue-yellow</string>









    <!-- Title shown for grayscale [CHAR LIMIT=45] -->









    <string name="daltonizer_mode_grayscale_title">Grayscale</string>









    <!-- Summary shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->









    <string name="daltonizer_mode_deuteranomaly_summary">Red-green</string>









    <string name="daltonizer_mode_deuteranomaly_summary">Green weak, deuteranomaly</string>









    <!-- Summary shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->









    <string name="daltonizer_mode_protanomaly_summary">Red-green</string>









    <string name="daltonizer_mode_protanomaly_summary">Red weak, protanomaly</string>









    <!-- Summary shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->









    <string name="daltonizer_mode_tritanomaly_summary">Blue-yellow</string>









    <string name="daltonizer_mode_tritanomaly_summary">Tritanomaly</string>

















    <!-- Title for the accessibility preference of the Extra Dim/Reduce Brightness feature that dims your screen. [CHAR LIMIT=NONE] -->









    <string name="reduce_bright_colors_preference_title">Extra dim</string>

























res/xml/accessibility_daltonizer_settings.xml



+22
−27






























Original line number
Diff line number
Diff line







@@ -28,10 +28,6 @@







        settings:allowDividerBelow="true"









        settings:searchable="false"/>



















    <PreferenceCategory









        android:title="@string/daltonizer_type"









        android:key="daltonizer_mode_category" >



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="daltonizer_mode_deuteranomaly"









        android:persistent="false"








@@ -49,11 +45,10 @@







        android:persistent="false"









        android:summary="@string/daltonizer_mode_tritanomaly_summary"









        android:title="@string/daltonizer_mode_tritanomaly_title" />



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="daltonizer_mode_grayscale"









        android:persistent="false"









        android:title="@string/daltonizer_mode_grayscale_title" />



















    </PreferenceCategory>



















</PreferenceScreen>
























src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java



+10
−2






























Original line number
Diff line number
Diff line







@@ -51,7 +51,10 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe

















    private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;









    private static final String KEY_PREVIEW = "daltonizer_preview";









    private static final String KEY_CATEGORY_MODE = "daltonizer_mode_category";









    private static final String KEY_DEUTERANOMALY = "daltonizer_mode_deuteranomaly";









    private static final String KEY_PROTANOMALY = "daltonizer_mode_protanomaly";









    private static final String KEY_TRITANOMEALY = "daltonizer_mode_tritanomaly";









    private static final String KEY_GRAYSCALE = "daltonizer_mode_grayscale";









    private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();



















    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,








@@ -82,6 +85,7 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe







        mComponentName = DALTONIZER_COMPONENT_NAME;









        mPackageName = getText(R.string.accessibility_display_daltonizer_preference_title);









        mHtmlDescription = getText(R.string.accessibility_display_daltonizer_preference_subtitle);









        mTopIntroTitle = getText(R.string.accessibility_daltonizer_about_intro_text);









        final View view = super.onCreateView(inflater, container, savedInstanceState);









        updateFooterPreference();









        return view;








@@ -111,9 +115,13 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe







    /** Customizes the order by preference key. */









    protected List<String> getPreferenceOrderList() {









        final List<String> lists = new ArrayList<>();









        lists.add(KEY_TOP_INTRO_PREFERENCE);









        lists.add(KEY_PREVIEW);









        lists.add(KEY_USE_SERVICE_PREFERENCE);









        lists.add(KEY_CATEGORY_MODE);









        lists.add(KEY_DEUTERANOMALY);









        lists.add(KEY_PROTANOMALY);









        lists.add(KEY_TRITANOMEALY);









        lists.add(KEY_GRAYSCALE);









        lists.add(KEY_GENERAL_CATEGORY);









        lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);









        return lists;