commit 77165f6d4bee9d367cb6e70a266645e1e755f3c6
author Alan Viverette <alanv@google.com> Fri Sep 27 23:13:04 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 27 23:13:05 2013 +0000
tree 91bbe362cbc0f21a5db065ce9d9d5a55cdb7b86a
parent c26f2615964b648515c86cac08b492cee19b0747
parent c402322a5b7cbad0cb453c7bb00ad9a70c942ac1

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

src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java

diff --git a/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
index 3934646..f3c8b1c 100644
--- a/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
@@ -92,6 +92,8 @@
                 final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
                         activity, locale, R.string.captioning_preview_text);
                 preview.setText(localizedText);
+            } else {
+                preview.setText(R.string.captioning_preview_text);
             }
         }
     }
@@ -110,6 +112,8 @@
             final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
                     context, locale, R.string.captioning_preview_characters);
             previewText.setText(localizedText);
+        } else {
+            previewText.setText(R.string.captioning_preview_characters);
         }
     }