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

Commit a606c43a authored by menghanli's avatar menghanli Committed by Menghan Li
Browse files

Provides TC ID for accessibility framework feature for "shortcut" part 

Goal: Improve readability which is a bit difficult because of string concatenation for accurate translation.
Root cause: In some locales, framework features name would be a word rather than a product name. Hence it need to be in the different position in a sentence.
Solution: Use whole sentence to translate instead of concatenating the string could solve this issue.

Bug: 185478543
Test: Manually testing
Change-Id: I5a0f04e7ab0d7aa789e10ce6f611cde9bf3660c1
parent 2ddfd561

res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -5258,6 +5258,8 @@ 
    <string name="accessibility_captioning_title">Caption preferences</string>

    <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->

    <string name="accessibility_screen_magnification_title">Magnification</string>

    <!-- Title for accessibility shortcut preference for magnification. [CHAR LIMIT=60] -->

    <string name="accessibility_screen_magnification_shortcut_title">Magnification shortcut</string>

    <!-- Title for the accessibility preference screen to edit magnification area. [CHAR LIMIT=35] -->

    <string name="accessibility_magnification_mode_title">Magnification type</string>

    <!-- Message for the accessibility preference screen to edit magnification area dialog. [CHAR LIMIT=none] -->
@@ -5480,6 +5482,8 @@ 
    <string name="accessibility_display_inversion_preference_title">Color inversion</string>

    <!-- Used in the accessibility service settings to control turning display color inversion on/off entirely. [CHAR LIMIT=NONE] -->

    <string name="accessibility_display_inversion_switch_title">Use color inversion</string>

    <!-- Title for accessibility shortcut preference for color inversion. [CHAR LIMIT=60] -->

    <string name="accessibility_display_inversion_shortcut_title">Color inversion shortcut</string>

    <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->

    <string name="accessibility_display_inversion_preference_subtitle">

        <![CDATA[Color inversion turns light screens dark.<br/><br/>
@@ -5531,6 +5535,8 @@ 
    <string name="accessibility_service_primary_open_title">Open <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 [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] -->

    <string name="accessibility_daltonizer_shortcut_title">Color correction shortcut</string>

    <!-- Title for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->

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

    <!-- Summary for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=NONE] -->
@@ -5610,6 +5616,8 @@ 
    <string name="reduce_bright_colors_preference_title">Extra dim</string>

    <!-- Title for the activation switch of the Reduce Brightness feature. [CHAR LIMIT=NONE] -->

    <string name="reduce_bright_colors_switch_title">Make screen extra dim</string>

    <!-- Title for accessibility shortcut preference for Reduce Brightness. [CHAR LIMIT=60] -->

    <string name="reduce_bright_colors_shortcut_title">Extra dim shortcut</string>

    <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->

    <string name="reduce_bright_colors_preference_summary" product="default">Dim screen beyond your phone\u2019s minimum brightness</string>

    <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->

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

+0 −10
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;

import com.android.settings.password.ConfirmDeviceCredentialActivity;

import com.android.settings.widget.SettingsMainSwitchPreference;

import com.android.settingslib.accessibility.AccessibilityUtils;



import java.util.List;
@@ -221,15 +220,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
                mComponentName);

    }



    @Override

    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {

        final AccessibilityServiceInfo info = getAccessibilityServiceInfo();

        final String switchBarText = (info == null) ? "" :

                getString(R.string.accessibility_service_primary_switch_title,

                        info.getResolveInfo().loadLabel(getPackageManager()));

        switchPreference.setTitle(switchBarText);

    }



    @Override

    protected void updateSwitchBarToggleSwitch() {

        final boolean checked = isAccessibilityServiceEnabled();

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

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ public class ToggleColorInversionPreferenceFragment extends 
        switchPreference.setTitle(R.string.accessibility_display_inversion_switch_title);

    }



    @Override

    protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {

        shortcutPreference.setTitle(R.string.accessibility_display_inversion_shortcut_title);

    }



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

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

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe 
        switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);

    }



    @Override

    protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {

        shortcutPreference.setTitle(R.string.accessibility_daltonizer_shortcut_title);

    }



    @Override

    int getUserShortcutTypes() {

        return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),

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

+9 −3
Original line number Diff line number Diff line
@@ -284,7 +284,14 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
    abstract int getUserShortcutTypes();



    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {

        switchPreference.setTitle(R.string.accessibility_service_primary_switch_title);

        final CharSequence title =

            getString(R.string.accessibility_service_primary_switch_title, mPackageName);

        switchPreference.setTitle(title);

    }



    protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {

        final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);

        shortcutPreference.setTitle(title);

    }



    protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
@@ -434,8 +441,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        mShortcutPreference.setKey(getShortcutPreferenceKey());

        mShortcutPreference.setOnClickCallback(this);



        final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);

        mShortcutPreference.setTitle(title);

        updateShortcutTitle(mShortcutPreference);



        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);

        generalCategory.addPreference(mShortcutPreference);