diff --git a/api/res/layout/status_preference.xml b/api/res/layout/status_preference.xml
index 65bf255aa..c8be5f06a 100644
--- a/api/res/layout/status_preference.xml
+++ b/api/res/layout/status_preference.xml
@@ -35,9 +35,9 @@
Synchronisierung läuft...
- Letzte Synchronisierung: %s
+ Letzte Synchronisierung:\n%s
Fehlgeschlagen am: %s
diff --git a/api/res/values/strings.xml b/api/res/values/strings.xml
index 5bc8ee5ae..934835327 100644
--- a/api/res/values/strings.xml
+++ b/api/res/values/strings.xml
@@ -154,7 +154,7 @@
Sync Ongoing...
- Last Sync: %s
+ Last Sync:\n%s
Failed On: %s
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 4911d1634..40091303c 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -226,7 +226,7 @@
Status
- Letztes Backup: %s
+ Letztes Backup:\n%s
Backup fehlgeschlagen
@@ -674,7 +674,7 @@
Setting requires Android 2.0+
- Standardeinstellungen für neue Aufgaben
+ Neue Aufgabenstandards
Standard Dringlichkeit
diff --git a/astrid/res/values/strings-backup.xml b/astrid/res/values/strings-backup.xml
index 752f5cb57..ba3b43e10 100644
--- a/astrid/res/values/strings-backup.xml
+++ b/astrid/res/values/strings-backup.xml
@@ -13,7 +13,7 @@
Status
- Latest: %s
+ Latest backup:\n%s
Last Backup Failed
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index f0a44a480..35be46734 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -6,19 +6,19 @@
-
-
-
-
-
-
@@ -47,7 +47,7 @@
-
diff --git a/astrid/res/xml/preferences_actfm.xml b/astrid/res/xml/preferences_actfm.xml
index 337d8a2a3..0864ecaae 100644
--- a/astrid/res/xml/preferences_actfm.xml
+++ b/astrid/res/xml/preferences_actfm.xml
@@ -5,7 +5,7 @@
-
-
-
-
diff --git a/astrid/res/xml/preferences_backup.xml b/astrid/res/xml/preferences_backup.xml
index 9fb467d18..4a1903a1e 100644
--- a/astrid/res/xml/preferences_backup.xml
+++ b/astrid/res/xml/preferences_backup.xml
@@ -5,7 +5,7 @@
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/xml/preferences_gtasks.xml b/astrid/res/xml/preferences_gtasks.xml
index 00ca30776..f4340d1c6 100644
--- a/astrid/res/xml/preferences_gtasks.xml
+++ b/astrid/res/xml/preferences_gtasks.xml
@@ -5,7 +5,7 @@
-
-
-
@@ -32,12 +32,12 @@
-
-
diff --git a/astrid/res/xml/preferences_oldtasks.xml b/astrid/res/xml/preferences_oldtasks.xml
index cf7f10249..9a59dd841 100644
--- a/astrid/res/xml/preferences_oldtasks.xml
+++ b/astrid/res/xml/preferences_oldtasks.xml
@@ -3,12 +3,12 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/EPr_manage_header">
-
-
diff --git a/astrid/res/xml/preferences_opencrx.xml b/astrid/res/xml/preferences_opencrx.xml
index 0cdd8da7a..373e784f1 100644
--- a/astrid/res/xml/preferences_opencrx.xml
+++ b/astrid/res/xml/preferences_opencrx.xml
@@ -5,7 +5,7 @@
-
-
-
@@ -54,11 +54,11 @@
-
-
diff --git a/astrid/res/xml/preferences_producteev.xml b/astrid/res/xml/preferences_producteev.xml
index 7c7627ce7..eac379611 100644
--- a/astrid/res/xml/preferences_producteev.xml
+++ b/astrid/res/xml/preferences_producteev.xml
@@ -5,7 +5,7 @@
-
-
-
@@ -30,11 +30,11 @@
-
-
diff --git a/astrid/res/xml/preferences_reminders.xml b/astrid/res/xml/preferences_reminders.xml
index 3d6e10c0c..afa1010d2 100644
--- a/astrid/res/xml/preferences_reminders.xml
+++ b/astrid/res/xml/preferences_reminders.xml
@@ -3,37 +3,37 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/rmd_EPr_alerts_header">
-
-
-
-
-
-
-
-
@@ -43,7 +43,7 @@
android:ringtoneType="notification"
android:showDefault="true"
android:showSilent="true" />
-
diff --git a/astrid/res/xml/preferences_rmilk.xml b/astrid/res/xml/preferences_rmilk.xml
index 537f4e168..93d72d878 100644
--- a/astrid/res/xml/preferences_rmilk.xml
+++ b/astrid/res/xml/preferences_rmilk.xml
@@ -5,7 +5,7 @@
-
-
-
-
diff --git a/astrid/src/com/todoroo/astrid/ui/MultilineCheckboxPreference.java b/astrid/src/com/todoroo/astrid/ui/MultilineCheckboxPreference.java
new file mode 100644
index 000000000..c9de51fa1
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/ui/MultilineCheckboxPreference.java
@@ -0,0 +1,18 @@
+package com.todoroo.astrid.ui;
+
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class MultilineCheckboxPreference extends CheckBoxPreference {
+ public MultilineCheckboxPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ protected void onBindView(View view) {
+ super.onBindView(view);
+ MultilineHelper.makeMultiline(view);
+ }
+}
diff --git a/astrid/src/com/todoroo/astrid/ui/MultilineHelper.java b/astrid/src/com/todoroo/astrid/ui/MultilineHelper.java
new file mode 100644
index 000000000..caeadfe7f
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/ui/MultilineHelper.java
@@ -0,0 +1,22 @@
+package com.todoroo.astrid.ui;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+public class MultilineHelper {
+ protected static void makeMultiline(View view) {
+ if (view instanceof ViewGroup) {
+
+ ViewGroup grp = (ViewGroup) view;
+
+ for (int index = 0; index < grp.getChildCount(); index++) {
+ makeMultiline(grp.getChildAt(index));
+ }
+ } else if (view instanceof TextView) {
+ TextView t = (TextView) view;
+ t.setSingleLine(false);
+ t.setEllipsize(null);
+ }
+ }
+}
diff --git a/astrid/src/com/todoroo/astrid/ui/MultilineListPreference.java b/astrid/src/com/todoroo/astrid/ui/MultilineListPreference.java
new file mode 100644
index 000000000..99c9078ea
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/ui/MultilineListPreference.java
@@ -0,0 +1,18 @@
+package com.todoroo.astrid.ui;
+
+import android.content.Context;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class MultilineListPreference extends ListPreference {
+ public MultilineListPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ protected void onBindView(View view) {
+ super.onBindView(view);
+ MultilineHelper.makeMultiline(view);
+ }
+}
diff --git a/astrid/src/com/todoroo/astrid/ui/MultilinePreference.java b/astrid/src/com/todoroo/astrid/ui/MultilinePreference.java
new file mode 100644
index 000000000..1c0f4fd9f
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/ui/MultilinePreference.java
@@ -0,0 +1,18 @@
+package com.todoroo.astrid.ui;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class MultilinePreference extends Preference {
+ public MultilinePreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ protected void onBindView(View view) {
+ super.onBindView(view);
+ MultilineHelper.makeMultiline(view);
+ }
+}