From b0877b390d8d96da30775dcd6161ecec59f006d0 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Fri, 20 Apr 2018 16:42:10 -0700 Subject: [PATCH] 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 --- src/com/android/settings/accessibility/AccessibilitySettings.java | 1 + .../accessibility/MagnificationGesturesPreferenceController.java | 6 ++---- .../accessibility/MagnificationNavbarPreferenceController.java | 7 ++----- .../settings/accessibility/ToggleFeaturePreferenceFragment.java | 5 ++++- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 3f7bd2582c..3f94af4666 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -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"; diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java index 98f6672b33..71901af1ac 100644 --- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java @@ -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); diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java index e0ea6f27c9..947893d76c 100644 --- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java @@ -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) diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 7dacbb0868..208bb73c6f 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -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); -- 2.11.0