PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix footer text not translated in Magnification settings.

Browse Source 
am: b0877b390d

Change-Id: I3ad2795e60b3f2147f9611b54b014aa491077ce7
This commit is contained in:
Doris Ling
2018-04-23 18:49:08 -07:00
committed by android-build-merger
parent 062dbc2054 b0877b390d
commit 84506b36c5
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -129,6 +129,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
static final String EXTRA_TITLE_RES = "title_res"; static final String EXTRA_TITLE_RES = "title_res";
static final String EXTRA_RESOLVE_INFO = "resolve_info"; static final String EXTRA_RESOLVE_INFO = "resolve_info";
static final String EXTRA_SUMMARY = "summary"; 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_SETTINGS_TITLE = "settings_title";
static final String EXTRA_COMPONENT_NAME = "component_name"; static final String EXTRA_COMPONENT_NAME = "component_name";
static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name"; static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";

6
src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
View File

@@ -65,12 +65,10 @@ public class MagnificationGesturesPreferenceController extends BasePreferenceCon
static void populateMagnificationGesturesPreferenceExtras(Bundle extras, Context context) { static void populateMagnificationGesturesPreferenceExtras(Bundle extras, Context context) {
extras.putString(AccessibilitySettings.EXTRA_PREFERENCE_KEY, extras.putString(AccessibilitySettings.EXTRA_PREFERENCE_KEY,
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED); 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, extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
R.string.accessibility_screen_magnification_gestures_title); R.string.accessibility_screen_magnification_gestures_title);
extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY, context.getResources().getText( extras.putInt(AccessibilitySettings.EXTRA_SUMMARY_RES,
R.string.accessibility_screen_magnification_summary)); R.string.accessibility_screen_magnification_summary);
extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,
Settings.Secure.getInt(context.getContentResolver(), Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1); Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);

7
src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
View File

@@ -39,13 +39,10 @@ public class MagnificationNavbarPreferenceController extends BasePreferenceContr
Bundle extras = preference.getExtras(); Bundle extras = preference.getExtras();
extras.putString(AccessibilitySettings.EXTRA_PREFERENCE_KEY, extras.putString(AccessibilitySettings.EXTRA_PREFERENCE_KEY,
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED); 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, extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES,
R.string.accessibility_screen_magnification_navbar_title); R.string.accessibility_screen_magnification_navbar_title);
extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY, extras.putInt(AccessibilitySettings.EXTRA_SUMMARY_RES,
mContext.getResources().getText( R.string.accessibility_screen_magnification_navbar_summary);
R.string.accessibility_screen_magnification_navbar_summary));
extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,
Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0)

5
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -135,7 +135,10 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
} }
// Summary. // 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( final CharSequence summary = arguments.getCharSequence(
AccessibilitySettings.EXTRA_SUMMARY); AccessibilitySettings.EXTRA_SUMMARY);
mFooterPreferenceMixin.createFooterPreference().setTitle(summary); mFooterPreferenceMixin.createFooterPreference().setTitle(summary);