Merge "Reduce string length for battery level and charging status."
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 14cdbcb..1001a21 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -61,6 +61,7 @@
android:hint="@string/owner_info_settings_edit_text_hint"
android:lines="8"
android:maxLines="8"
+ android:inputType="textNoSuggestions|textMultiLine"
/>
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 00f19f1..0354bec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2792,7 +2792,7 @@
<!-- 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>
<!-- 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 -->
<string name="battery_since_unplugged">Battery use since unplugged</string>
<!-- Battery usage since user reset the stats -->