Merge "Reduce string length for battery level and charging status."

This commit is contained in:
Amith Yamasani
2011-09-14 11:16:09 -07:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 1 deletions

View File

@@ -61,6 +61,7 @@
android:hint="@string/owner_info_settings_edit_text_hint" android:hint="@string/owner_info_settings_edit_text_hint"
android:lines="8" android:lines="8"
android:maxLines="8" android:maxLines="8"
android:inputType="textNoSuggestions|textMultiLine"
/> />
</LinearLayout> </LinearLayout>

View File

@@ -2792,7 +2792,7 @@ found in the list of installed applications.</string>
<!-- Message to show when battery usage data is not available [CHAR LIMIT=30] --> <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
<string name="power_usage_not_available">Battery usage data not available</string> <string name="power_usage_not_available">Battery usage data not available</string>
<!-- Display the battery level and status [CHAR_LIMIT=30] --> <!-- Display the battery level and status [CHAR_LIMIT=30] -->
<string name="power_usage_level_and_status">Battery level <xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string> <string name="power_usage_level_and_status"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string>
<!-- Battery usage since unplugged --> <!-- Battery usage since unplugged -->
<string name="battery_since_unplugged">Battery use since unplugged</string> <string name="battery_since_unplugged">Battery use since unplugged</string>
<!-- Battery usage since user reset the stats --> <!-- Battery usage since user reset the stats -->