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

Commit e4cdbcba authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge "Color correction improvement (5/n)"

parents f5dc746f 756d819c

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4948,7 +4948,7 @@ 
    <!-- Used in the accessibility service settings to control turning on/off the service entirely -->

    <string name="accessibility_service_master_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>

    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->

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

    <string name="accessibility_daltonizer_master_switch_title">Correct colors</string>

    <!-- Used in the Captions settings screen to control turning on/off the feature entirely -->

    <string name="accessibility_caption_master_switch_title">Show captions</string>

    <!-- Title for Caption preference settings screen for configuring font style. [CHAR LIMIT=NONE] -->

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

+2 −4
Original line number Diff line number Diff line
@@ -105,10 +105,8 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere 


    @Override

    protected void updateSwitchBarText(SwitchBar switchBar) {

        final String switchBarText = getString(

                R.string.accessibility_display_inversion_switch_title,

                getString(R.string.accessibility_display_inversion_switch_title));

        switchBar.setSwitchBarText(switchBarText, switchBarText);

        switchBar.setSwitchBarText(R.string.accessibility_display_inversion_switch_title,

                R.string.accessibility_display_inversion_switch_title);

    }



    @Override

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

+2 −3
Original line number Diff line number Diff line
@@ -325,9 +325,8 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe 


    @Override

    protected void updateSwitchBarText(SwitchBar switchBar) {

        final String switchBarText = getString(R.string.accessibility_service_master_switch_title,

                getString(R.string.accessibility_display_daltonizer_preference_title));

        switchBar.setSwitchBarText(switchBarText, switchBarText);

        switchBar.setSwitchBarText(R.string.accessibility_daltonizer_master_switch_title,

                R.string.accessibility_daltonizer_master_switch_title);

    }



    @Override