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

am 2c72ba6d: am 3b1520ee: am 78995994: Updating the screen magnification strings.

Browse Source 
* commit '2c72ba6de2e2dbce1278ef67db0e65439c9c1577':
  Updating the screen magnification strings.
This commit is contained in:
Svetoslav Ganov
2012-10-05 14:21:17 -07:00
committed by Android Git Automerger
parent 897c3c8937 2c72ba6de2
commit 4b4297f7fc
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/AccessibilitySettings.java
View File

@@ -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);
}
}

2
src/com/android/settings/LocalePicker.java
View File

@@ -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() {