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

am 77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev

Browse Source 
* commit '77165f6d4bee9d367cb6e70a266645e1e755f3c6':
  Restore default locale in Captioning Settings
This commit is contained in:
Alan Viverette
2013-09-30 17:09:28 -07:00
committed by Android Git Automerger
parent 3a7eb5f1a8 77165f6d4b
commit 1e33aac9ef
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
View File

@@ -92,6 +92,8 @@ public class ToggleCaptioningPreferenceFragment extends Fragment {
final CharSequence localizedText = AccessibilityUtils.getTextForLocale( final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
activity, locale, R.string.captioning_preview_text); activity, locale, R.string.captioning_preview_text);
preview.setText(localizedText); preview.setText(localizedText);
} else {
preview.setText(R.string.captioning_preview_text);
} }
} }
} }
@@ -110,6 +112,8 @@ public class ToggleCaptioningPreferenceFragment extends Fragment {
final CharSequence localizedText = AccessibilityUtils.getTextForLocale( final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
context, locale, R.string.captioning_preview_characters); context, locale, R.string.captioning_preview_characters);
previewText.setText(localizedText); previewText.setText(localizedText);
} else {
previewText.setText(R.string.captioning_preview_characters);
} }
} }