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

Commit b0877b39 authored by Doris Ling's avatar Doris Ling
Browse files

Fix footer text not translated in Magnification settings. 

- pass in the summary res id instead of the actual text when building
the launch bundle for the magnification settings.
- remove the title argument as we are passing the title res already,
which takes precedence.

Change-Id: I4ba624e1d9722aa980ea94c306df9a015a159555
Fixes: 78126057
Test: run i18nscreenshots
parent ac951a69

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

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
    static final String EXTRA_TITLE_RES = "title_res";

    static final String EXTRA_RESOLVE_INFO = "resolve_info";

    static final String EXTRA_SUMMARY = "summary";

    static final String EXTRA_SUMMARY_RES = "summary_res";

    static final String EXTRA_SETTINGS_TITLE = "settings_title";

    static final String EXTRA_COMPONENT_NAME = "component_name";

    static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";

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

+2 −4
Original line number Diff line number Diff line
@@ -65,12 +65,10 @@ public class MagnificationGesturesPreferenceController extends BasePreferenceCon 
    static void populateMagnificationGesturesPreferenceExtras(Bundle extras, Context context) {

        extras.putString(AccessibilitySettings.EXTRA_PREFERENCE_KEY,

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);

        extras.putString(AccessibilitySettings.EXTRA_TITLE, context.getString(

                R.string.accessibility_screen_magnification_gestures_title));

        extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,

                R.string.accessibility_screen_magnification_gestures_title);

        extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY, context.getResources().getText(

                R.string.accessibility_screen_magnification_summary));

        extras.putInt(AccessibilitySettings.EXTRA_SUMMARY_RES,

                R.string.accessibility_screen_magnification_summary);

        extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,

                Settings.Secure.getInt(context.getContentResolver(),

                        Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);

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

+2 −5
Original line number Diff line number Diff line
@@ -39,13 +39,10 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr 
            Bundle extras = preference.getExtras();

            extras.putString(AccessibilitySettings.EXTRA_PREFERENCE_KEY,

                    Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);

            extras.putString(AccessibilitySettings.EXTRA_TITLE, mContext.getString(

                    R.string.accessibility_screen_magnification_navbar_title));

            extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,

                    R.string.accessibility_screen_magnification_navbar_title);

            extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY,

                    mContext.getResources().getText(

                            R.string.accessibility_screen_magnification_navbar_summary));

            extras.putInt(AccessibilitySettings.EXTRA_SUMMARY_RES,

                    R.string.accessibility_screen_magnification_navbar_summary);

            extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,

                    Settings.Secure.getInt(mContext.getContentResolver(),

                            Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0)

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

+4 −1
Original line number Diff line number Diff line
@@ -135,7 +135,10 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        }



        // Summary.

        if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {

        if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY_RES)) {

            final int summary = arguments.getInt(AccessibilitySettings.EXTRA_SUMMARY_RES);

            mFooterPreferenceMixin.createFooterPreference().setTitle(summary);

        } else if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {

            final CharSequence summary = arguments.getCharSequence(

                    AccessibilitySettings.EXTRA_SUMMARY);

            mFooterPreferenceMixin.createFooterPreference().setTitle(summary);