Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 4c206dd..7e917d8 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -97,7 +97,8 @@
<TextView
android:id="@android:id/empty"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1"
android:gravity="center"
android:visibility="gone" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b39e8b5..25b9413 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1786,7 +1786,7 @@
<!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
<string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
<!-- Display settings screen, trigger for screen saver options -->
- <string name="screensaver_settings_title">Sleep Mode</string>
+ <string name="screensaver_settings_title">Daydreams</string>
<!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked -->
<string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
<!-- Dream settings screen, dialog option, activated on sleep or docked -->
@@ -1800,9 +1800,9 @@
<!-- Dream settings screen, caption for when dreams are disabled -->
<string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn Sleep Mode on.</string>
<!-- Dream settings screen, action label, when to dream -->
- <string name="screensaver_settings_when_to_dream">When to sleep</string>
+ <string name="screensaver_settings_when_to_dream">When to daydream</string>
<!-- Dream settings screen, button label to start dreaming -->
- <string name="screensaver_settings_dream_start">Sleep now</string>
+ <string name="screensaver_settings_dream_start">Start now</string>
<!-- Dream settings screen, button label for settings for a specific screensaver -->
<string name="screensaver_settings_button">Settings</string>
<!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 9f812fe..fb839a7 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -154,15 +154,19 @@
} else {
final CharSequence[] entries = preference.getEntries();
final CharSequence[] values = preference.getEntryValues();
- int best = 0;
- for (int i = 0; i < values.length; i++) {
- long timeout = Long.parseLong(values[i].toString());
- if (currentTimeout >= timeout) {
- best = i;
+ if (entries == null || entries.length == 0) {
+ summary = "";
+ } else {
+ int best = 0;
+ for (int i = 0; i < values.length; i++) {
+ long timeout = Long.parseLong(values[i].toString());
+ if (currentTimeout >= timeout) {
+ best = i;
+ }
}
+ summary = preference.getContext().getString(R.string.screen_timeout_summary,
+ entries[best]);
}
- summary = preference.getContext().getString(R.string.screen_timeout_summary,
- entries[best]);
}
preference.setSummary(summary);
}