Merge "Restore default locale in Captioning Settings" into klp-dev

This commit is contained in:
Alan Viverette
2013-09-27 23:13:04 +00:00
committed by Android (Google) Code Review

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