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

Updating the screen magnification strings.

Browse Source 
bug:7295457

Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
This commit is contained in:
Svetoslav Ganov
2012-10-05 14:02:36 -07:00
parent 4a58b1006c
commit 78995994b9
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/values/strings.xml
View File

@@ -3091,20 +3091,9 @@
<!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] --> <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
<string name="accessibility_system_title">System</string> <string name="accessibility_system_title">System</string>
<!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] --> <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
<string name="accessibility_screen_magnification_title">Screen magnification</string> <string name="accessibility_screen_magnification_title">Magnification gestures</string>
<!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] --> <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
<string name="accessibility_screen_magnification_summary"> <string name="accessibility_screen_magnification_summary">When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n<ul><li>Pan: Drag two or more fingers across the screen.</li>\n<li>Adjust zoom level: Pinch two or more fingers together or spread them apart.</li></ul>\n\nYou can also temporarily magnify what\'s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar.</string>
When screen magnification is on, you can\:\n\n
Zoom: Triple-tap &amp; hold.\n
Zoom &amp; pan: Triple-tap &amp; hold, then drag your finger.\n
Toggle zoom in or out: Triple tap &amp; release.\n\n
While you\'re zoomed in, you can:\n
Pan: Drag two or more fingers across the screen.\n
Adjust zoom level: Pinch or expand using two or more fingers.
</string>
<!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] --> <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
<string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string> <string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string>
<!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] --> <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->

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

@@ -282,7 +282,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras(); Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras();
extras.putString(EXTRA_TITLE, getString( extras.putString(EXTRA_TITLE, getString(
R.string.accessibility_screen_magnification_title)); R.string.accessibility_screen_magnification_title));
extras.putString(EXTRA_SUMMARY, getString( extras.putCharSequence(EXTRA_SUMMARY, getActivity().getResources().getText(
R.string.accessibility_screen_magnification_summary)); R.string.accessibility_screen_magnification_summary));
extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(), extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1); Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);
@@ -1005,7 +1005,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
getActivity().getActionBar().setTitle(title); getActivity().getActionBar().setTitle(title);
} }
// Summary. // Summary.
String summary = arguments.getString(EXTRA_SUMMARY); CharSequence summary = arguments.getCharSequence(EXTRA_SUMMARY);
mSummaryPreference.setSummary(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)); mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
} }
public Dialog onCreateDialog(int dialogId) { public Dialog onCreateDialog(final int dialogId) {
return Utils.buildGlobalChangeWarningDialog(getActivity(), return Utils.buildGlobalChangeWarningDialog(getActivity(),
R.string.global_locale_change_title, R.string.global_locale_change_title,
new Runnable() { new Runnable() {