diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-10-05 14:02:36 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2012-10-05 14:13:42 -0700 |
| commit | 78995994b9b0afbc4c4705e41d1c4ac944e557f2 (patch) | |
| tree | 1ae6eaf171d3374a28d99af0559d2713b776e662 /src | |
| parent | 4a58b1006cec93565a7106c117b2c87248341404 (diff) | |
| download | packages_apps_settings-78995994b9b0afbc4c4705e41d1c4ac944e557f2.zip packages_apps_settings-78995994b9b0afbc4c4705e41d1c4ac944e557f2.tar.gz packages_apps_settings-78995994b9b0afbc4c4705e41d1c4ac944e557f2.tar.bz2 | |
Updating the screen magnification strings.
bug:7295457
Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/AccessibilitySettings.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/LocalePicker.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java index 266621f..d64a092 100644 --- a/src/com/android/settings/AccessibilitySettings.java +++ b/src/com/android/settings/AccessibilitySettings.java @@ -282,7 +282,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras(); extras.putString(EXTRA_TITLE, getString( R.string.accessibility_screen_magnification_title)); - extras.putString(EXTRA_SUMMARY, getString( + extras.putCharSequence(EXTRA_SUMMARY, getActivity().getResources().getText( R.string.accessibility_screen_magnification_summary)); extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1); @@ -1005,7 +1005,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements getActivity().getActionBar().setTitle(title); } // Summary. - String summary = arguments.getString(EXTRA_SUMMARY); + CharSequence summary = arguments.getCharSequence(EXTRA_SUMMARY); mSummaryPreference.setSummary(summary); } } diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java index 5827ef7..0afa4d5 100644 --- a/src/com/android/settings/LocalePicker.java +++ b/src/com/android/settings/LocalePicker.java @@ -76,7 +76,7 @@ public class LocalePicker extends com.android.internal.app.LocalePicker mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId)); } - public Dialog onCreateDialog(int dialogId) { + public Dialog onCreateDialog(final int dialogId) { return Utils.buildGlobalChangeWarningDialog(getActivity(), R.string.global_locale_change_title, new Runnable() { |