Fix for 17036871, Enable line-wrap for preferences-entries.

pull/14/head
Arne Jans 13 years ago
parent c876644569
commit a77836a356

@ -35,9 +35,9 @@
<TextView android:id="@+android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:singleLine="false"
android:textAppearance="?android:attr/textAppearanceLarge"
android:ellipsize="marquee"
android:ellipsize="none"
android:fadingEdge="horizontal" />
<TextView android:id="@+android:id/summary"

@ -154,7 +154,7 @@
<!-- Status: ongoing -->
<string name="sync_status_ongoing">Synchronisierung läuft...</string>
<!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
<string name="sync_status_success">Letzte Synchronisierung: %s</string>
<string name="sync_status_success">Letzte Synchronisierung:\n%s</string>
<!-- Sync Status: failure status (%s -> last attempted sync date) -->
<string name="sync_status_failed">Fehlgeschlagen am: %s</string>
<!-- Sync Status: error status (%s -> last sync date) -->

@ -154,7 +154,7 @@
<!-- Status: ongoing -->
<string name="sync_status_ongoing">Sync Ongoing...</string>
<!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
<string name="sync_status_success">Last Sync: %s</string>
<string name="sync_status_success">Last Sync:\n%s</string>
<!-- Sync Status: failure status (%s -> last attempted sync date) -->
<string name="sync_status_failed">Failed On: %s</string>
<!-- Sync Status: error status (%s -> last sync date) -->

@ -674,7 +674,7 @@
<string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
<!-- Preference Category: Defaults Title -->
<string name="EPr_defaults_header">Standardeinstellungen für neue Aufgaben</string>
<string name="EPr_defaults_header">Neue Aufgabenstandards</string>
<!-- Preference: Default Urgency Title -->
<string name="EPr_default_urgency_title">Standard Dringlichkeit</string>

@ -6,19 +6,19 @@
<PreferenceScreen android:title="" android:key="@string/p_about" />
<PreferenceCategory
android:title="@string/EPr_appearance_header">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_fontSize"
android:entries="@array/EPr_font_size"
android:entryValues="@array/EPr_font_size"
android:title="@string/EPr_fontSize_title"
android:summary="@string/EPr_fontSize_desc" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_showNotes"
android:title="@string/EPr_showNotes_title"
android:defaultValue="true" />
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_theme"
android:entries="@array/EPr_themes"
android:entryValues="@array/EPr_theme_settings"
@ -30,16 +30,16 @@
<PreferenceScreen
android:title="@string/EPr_voice_header">
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_voiceInputEnabled"
android:title="@string/EPr_voiceInputEnabled_title"
android:defaultValue="true" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_voiceInputCreatesTask"
android:title="@string/EPr_voiceInputCreatesTask_title"
android:dependency="@string/p_voiceInputEnabled"
android:defaultValue="false" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_voiceRemindersEnabled"
android:title="@string/EPr_voiceRemindersEnabled_title"
android:defaultValue="false" />
@ -47,7 +47,7 @@
</PreferenceScreen>
</PreferenceCategory>
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_statistics"
android:title="@string/EPr_statistics_title"
android:defaultValue="true" />

@ -5,7 +5,7 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_status">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:layout="@layout/status_preference"
android:key="@string/sync_SPr_status_key"
android:textSize="24sp"
@ -16,7 +16,7 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_options">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/actfm_APr_interval_key"
android:entries="@array/sync_SPr_interval_entries"
android:entryValues="@array/sync_SPr_interval_values"
@ -27,11 +27,11 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_actions">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_sync_key"
android:title="@string/sync_SPr_sync" />
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_forget_key"
android:title="@string/sync_SPr_forget"
android:summary="@string/sync_SPr_forget_description" />

@ -5,7 +5,7 @@
<PreferenceCategory
android:title="@string/backup_BPr_group_status">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:layout="@layout/status_preference"
android:key="@string/backup_BPr_status_key"
android:textSize="24sp"
@ -16,14 +16,14 @@
<PreferenceCategory
android:title="@string/backup_BPr_group_options">
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/backup_BPr_auto_key"
android:title="@string/backup_BPr_auto_title"
android:defaultValue="true" />
</PreferenceCategory>
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/backup_BAc_label"
android:title="@string/backup_BAc_label"
android:textSize="24sp"

@ -2,32 +2,32 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/EPr_defaults_header">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_default_importance_key"
android:entries="@array/EPr_default_importance"
android:entryValues="@array/EPr_default_importance_values"
android:title="@string/EPr_default_importance_title" />
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_default_urgency_key"
android:entries="@array/EPr_default_urgency"
android:entryValues="@array/EPr_default_urgency_values"
android:title="@string/EPr_default_urgency_title" />
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_default_hideUntil_key"
android:entries="@array/EPr_default_hideUntil"
android:entryValues="@array/EPr_default_hideUntil_values"
android:title="@string/EPr_default_hideUntil_title" />
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_default_reminders_key"
android:entries="@array/EPr_default_reminders"
android:entryValues="@array/EPr_default_reminders_values"
android:title="@string/EPr_default_reminders_title" />
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_rmd_default_random_hours"
android:title="@string/rmd_EPr_defaultRemind_title"
android:entries="@array/EPr_reminder_random"
android:entryValues="@array/EPr_reminder_random_hours" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:title="@string/EPr_default_addtocalendar_title"
android:key="@string/p_default_addtocalendar_key"
android:defaultValue="false"/>

@ -5,7 +5,7 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_status">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:layout="@layout/status_preference"
android:key="@string/sync_SPr_status_key"
android:textSize="24sp"
@ -16,13 +16,13 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_options">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/gtasks_GPr_interval_key"
android:entries="@array/sync_SPr_interval_entries"
android:entryValues="@array/sync_SPr_interval_values"
android:title="@string/sync_SPr_interval_title" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/gtasks_GPr_sync_on_save_key"
android:title="@string/gtasks_GPr_sync_on_save"
android:summary="@string/gtasks_GPr_sync_on_save_summary" />
@ -32,12 +32,12 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_actions">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_sync_key"
android:title="@string/sync_SPr_sync"
android:summary=""/>
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_forget_key"
android:title="@string/sync_SPr_forget"
android:summary="@string/sync_SPr_forget_description" />

@ -3,12 +3,12 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/EPr_manage_header">
<PreferenceScreen
<com.todoroo.astrid.ui.MultilinePreference
android:title="@string/EPr_manage_delete_completed"
android:key="@string/EPr_manage_delete_completed"
android:summary="@string/EPr_manage_delete_completed_summary"/>
<PreferenceScreen
<com.todoroo.astrid.ui.MultilinePreference
android:title="@string/EPr_manage_purge_deleted"
android:key="@string/EPr_manage_purge_deleted"
android:summary="@string/EPr_manage_purge_deleted_summary"/>

@ -5,7 +5,7 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_status">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:layout="@layout/status_preference"
android:key="@string/sync_SPr_status_key"
android:textSize="24sp"
@ -16,13 +16,13 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_options">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/opencrx_PPr_interval_key"
android:entries="@array/sync_SPr_interval_entries"
android:entryValues="@array/sync_SPr_interval_values"
android:title="@string/sync_SPr_interval_title" />
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/opencrx_PPr_defaultcreator_key"
android:title="@string/opencrx_PPr_defaultcreator_title" />
@ -54,11 +54,11 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_actions">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_sync_key"
android:title="@string/sync_SPr_sync" />
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_forget_key"
android:title="@string/sync_SPr_forget"
android:summary="@string/sync_SPr_forget_description" />

@ -5,7 +5,7 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_status">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:layout="@layout/status_preference"
android:key="@string/sync_SPr_status_key"
android:textSize="24sp"
@ -16,13 +16,13 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_options">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/producteev_PPr_interval_key"
android:entries="@array/sync_SPr_interval_entries"
android:entryValues="@array/sync_SPr_interval_values"
android:title="@string/sync_SPr_interval_title" />
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/producteev_PPr_defaultdash_key"
android:title="@string/producteev_PPr_defaultdash_title" />
@ -30,11 +30,11 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_actions">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_sync_key"
android:title="@string/sync_SPr_sync" />
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_forget_key"
android:title="@string/sync_SPr_forget"
android:summary="@string/sync_SPr_forget_description" />

@ -3,37 +3,37 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/rmd_EPr_alerts_header">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_rmd_quietStart"
android:entries="@array/EPr_quiet_hours_start"
android:entryValues="@array/EPr_quiet_hours_start_values"
android:title="@string/rmd_EPr_quiet_hours_start_title"/>
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_rmd_quietEnd"
android:entries="@array/EPr_quiet_hours_end"
android:entryValues="@array/EPr_quiet_hours_end_values"
android:title="@string/rmd_EPr_quiet_hours_end_title"/>
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_rmd_time"
android:entries="@array/EPr_rmd_time"
android:entryValues="@array/EPr_rmd_time_values"
android:title="@string/rmd_EPr_rmd_time_title"/>
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_rmd_persistent"
android:title="@string/rmd_EPr_persistent_title"/>
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_rmd_maxvolume"
android:title="@string/rmd_EPr_multiple_maxvolume_title"
android:defaultValue="false" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_rmd_vibrate"
android:title="@string/rmd_EPr_vibrate_title"
android:defaultValue="true" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_rmd_nagging"
android:title="@string/rmd_EPr_nagging_title"
android:defaultValue="true" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_rmd_snooze_dialog"
android:title="@string/rmd_EPr_snooze_dialog_title"
android:defaultValue="false" />
@ -43,7 +43,7 @@
android:ringtoneType="notification"
android:showDefault="true"
android:showSilent="true" />
<CheckBoxPreference
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_rmd_enabled"
android:title="@string/rmd_EPr_enabled_title"
android:defaultValue="true"/>

@ -5,7 +5,7 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_status">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:layout="@layout/status_preference"
android:key="@string/sync_SPr_status_key"
android:textSize="24sp"
@ -16,7 +16,7 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_options">
<ListPreference
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/rmilk_MPr_interval_key"
android:entries="@array/sync_SPr_interval_entries"
android:entryValues="@array/sync_SPr_interval_values"
@ -27,11 +27,11 @@
<PreferenceCategory
android:title="@string/sync_SPr_group_actions">
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_sync_key"
android:title="@string/sync_SPr_sync" />
<Preference
<com.todoroo.astrid.ui.MultilinePreference
android:key="@string/sync_SPr_forget_key"
android:title="@string/sync_SPr_forget"
android:summary="@string/sync_SPr_forget_description" />

@ -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);
}
}

@ -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);
}
}
}

@ -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);
}
}

@ -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);
}
}
Loading…
Cancel
Save