From b9d7a9ff051752cb2ff17b880bbe9204c90cbc10 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Mon, 16 Mar 2015 16:17:45 -0500
Subject: [PATCH] Flattened preference menus

---
 .../astrid/activity/EditPreferences.java      |  8 +-
 src/main/res/values-bg-rBG/strings.xml        |  1 -
 src/main/res/values-cs/strings.xml            |  1 -
 src/main/res/values-de/strings.xml            |  1 -
 src/main/res/values-el/strings.xml            |  1 -
 src/main/res/values-es/strings.xml            |  1 -
 src/main/res/values-fr/strings.xml            |  1 -
 src/main/res/values-it/strings.xml            |  1 -
 src/main/res/values-iw/strings.xml            |  1 -
 src/main/res/values-ja/strings.xml            |  1 -
 src/main/res/values-ko/strings.xml            |  1 -
 src/main/res/values-nl/strings.xml            |  1 -
 src/main/res/values-pl/strings.xml            |  1 -
 src/main/res/values-pt-rBR/strings.xml        |  1 -
 src/main/res/values-pt/strings.xml            |  1 -
 src/main/res/values-ru/strings.xml            |  1 -
 src/main/res/values-sl-rSI/strings.xml        |  1 -
 src/main/res/values-sv/strings.xml            |  1 -
 src/main/res/values-tr/strings.xml            |  1 -
 src/main/res/values-uk/strings.xml            |  1 -
 src/main/res/values-zh-rCN/strings.xml        |  1 -
 src/main/res/values-zh-rTW/strings.xml        |  1 -
 src/main/res/values/keys.xml                  |  7 +-
 src/main/res/values/strings-core.xml          |  7 +-
 src/main/res/xml/preferences.xml              | 75 ++++++++-----------
 src/main/res/xml/preferences_misc.xml         |  5 ++
 26 files changed, 44 insertions(+), 79 deletions(-)

diff --git a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
index 2b72f87be..26590e255 100644
--- a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
+++ b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
@@ -92,12 +92,9 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
         addPreferencesFromResource(R.xml.preferences_misc);
 
-        final Resources r = getResources();
-
         // first-order preferences
 
-        Preference beastMode = findPreference(getString(R.string.p_beastMode));
-        beastMode.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+        findPreference(getString(R.string.p_beastMode)).setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference p) {
                 showBeastMode();
@@ -105,8 +102,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
             }
         });
 
-        Preference preference = screen.findPreference(getString(R.string.p_files_dir));
-        preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+        screen.findPreference(getString(R.string.p_files_dir)).setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference p) {
                 Intent filesDir = new Intent(EditPreferences.this, FileExplore.class);
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 538fc368a..d5cf5d4b6 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -200,7 +200,6 @@
 	<string name="EPr_fullTask_desc_enabled">Ще бъде показвано пълно име на задачата</string>
 	<string name="EPr_fullTask_desc_disabled">Ще бъдат показвани първите два реда от имета на задачата</string>
 	<string name="EPr_show_task_edit_comments">Покажи коментари при редакция на задача</string>
-	<string name="EPr_taskRowPrefs_title">Изглед на реда със задачата</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Време на събитие в календара</string>
 	<string name="EPr_cal_end_at_due_time">Приключване на събития в календара на крайния срок</string>
 	<string name="EPr_cal_start_at_due_time">Започване на събития в календара на крайния срок</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 861ce1eef..cd05fc584 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -191,7 +191,6 @@
 	<string name="EPr_fullTask_desc_enabled">Zobrazí se úplný název úkolu</string>
 	<string name="EPr_fullTask_desc_disabled">Zobrazí se první dva řádky názvu úkolu</string>
 	<string name="EPr_show_task_edit_comments">Zobrazit komentáře při úpravě úkolu</string>
-	<string name="EPr_taskRowPrefs_title">Vzhled řádku úkolu</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Čas události v kalendáři</string>
 	<string name="EPr_cal_end_at_due_time">Událost v kalendáři končí splněním úkolu</string>
 	<string name="EPr_cal_start_at_due_time">Událost v kalendáři začíná splněním úkolu</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 2f9314f3e..965dff9ac 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -195,7 +195,6 @@
 	<string name="EPr_fullTask_desc_enabled">Aufgabentitel wird vollständig angezeigt</string>
 	<string name="EPr_fullTask_desc_disabled">Die ersten beiden Zeilen des Aufgabentitels werden angezeigt</string>
 	<string name="EPr_show_task_edit_comments">Kommentare bei Aufgabeneingabe anzeigen </string>
-	<string name="EPr_taskRowPrefs_title">Aussehen der Aufgabenzeilen</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Zeitpunkt Kalendertermin</string>
 	<string name="EPr_cal_end_at_due_time">Kalendereintrag endet zur Fälligkeits-Uhrzeit</string>
 	<string name="EPr_cal_start_at_due_time">Kalendereintrag Startet zur Fälligkeits-Uhrzeit</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index bd3de745c..2ef0c9f04 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -196,7 +196,6 @@
 	<string name="EPr_fullTask_desc_enabled">Εμφάνισε πλήρη τίτλο εργασίας</string>
 	<string name="EPr_fullTask_desc_disabled">Εμφάνισε τις δύο πρώτες γραμμές της εργασίας</string>
 	<string name="EPr_show_task_edit_comments">Εμφάνιση σχόλιων στην επεξεργασία εργασίας</string>
-	<string name="EPr_taskRowPrefs_title">Εμφάνιση σειράς εργασίας</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Ώρα γεγονότος ημερολογίου</string>
 	<string name="EPr_cal_end_at_due_time">Τερματισμός γεγονότων ημερολογίου στην ώρα λήξης τους</string>
 	<string name="EPr_cal_start_at_due_time">Εκκίνηση γεγονότων ημερολογίου στην ώρα λήξης τους</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 27b167612..9f48d3875 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -197,7 +197,6 @@
 	<string name="EPr_fullTask_desc_enabled">Se mostrará completo el título de la tarea</string>
 	<string name="EPr_fullTask_desc_disabled">Las primeras dos lineas de las tareas serán mostradas</string>
 	<string name="EPr_show_task_edit_comments">Mostrar comentarios durante la edición de tareas</string>
-	<string name="EPr_taskRowPrefs_title">Apariencia de la fila de tareas</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Momento del evento en calendario</string>
 	<string name="EPr_cal_end_at_due_time">Finalizar los eventos del calendario en su fecha de vencimiento</string>
 	<string name="EPr_cal_start_at_due_time">Iniciar los eventos del calendario en su fecha de vencimiento</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 3fb302f9c..548037931 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -194,7 +194,6 @@
 	<string name="EPr_fullTask_desc_enabled">Le titre entier de la tâche sera montré</string>
 	<string name="EPr_fullTask_desc_disabled">Les deux premières lignes du titre de la tâche seront montrées</string>
 	<string name="EPr_show_task_edit_comments">Afficher les commentaires dans l\'édition de tâches</string>
-	<string name="EPr_taskRowPrefs_title">Style des lignes de tâche</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Heure de l\'évenement dans le calendrier</string>
 	<string name="EPr_cal_end_at_due_time">Terminer les événements dans le calendrier à l\'échéance</string>
 	<string name="EPr_cal_start_at_due_time">Commencer les événements dans le calendrier à l\'échéance</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index ab47fc984..975a66c90 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -175,7 +175,6 @@
 	<string name="EPr_fullTask_title">Visualizza titolo completo dell\'attività</string>
 	<string name="EPr_fullTask_desc_enabled">Sarà mostrato il titolo completo</string>
 	<string name="EPr_fullTask_desc_disabled">Saranno mostrate le prime due righe del titolo dell\'attività</string>
-	<string name="EPr_taskRowPrefs_title">Aspetto della riga dei task</string>
 	<string name="EPr_manage_header">Gestisci compiti vecchi</string>
 	<string name="EPr_manage_delete_completed">Elimina i compiti completati</string>
 	<string name="EPr_manage_delete_completed_message">Vuoi davvero eliminare tutti i compiti completati?</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 8aa038a4a..f95089580 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -193,7 +193,6 @@
 	<string name="EPr_fullTask_desc_enabled">כותרות משימה מלאות תוצגנה</string>
 	<string name="EPr_fullTask_desc_disabled">שתי השורות הראשונות של שם המשימה תוצגנה</string>
 	<string name="EPr_show_task_edit_comments">הצגת הערות בעריכת משימה</string>
-	<string name="EPr_taskRowPrefs_title">חזות שורת המשימה</string>
 	<string name="EPr_cal_end_or_start_at_due_time">משך אירוע יומן</string>
 	<string name="EPr_cal_end_at_due_time">סיים את אירועי היומן במועד היעד?</string>
 	<string name="EPr_cal_start_at_due_time">התחל את מאורעות היומן במועד היעד</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 3939b765d..fd2c64d1b 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -197,7 +197,6 @@
 	<string name="EPr_fullTask_desc_enabled">完全なタスク見出しが表示されます</string>
 	<string name="EPr_fullTask_desc_disabled">タスク見出しの最初の 2 行が表示されます</string>
 	<string name="EPr_show_task_edit_comments">タスク編集でコメントを表示</string>
-	<string name="EPr_taskRowPrefs_title">タスク行の外観</string>
 	<string name="EPr_cal_end_or_start_at_due_time">カレンダーイベント時間</string>
 	<string name="EPr_cal_end_at_due_time">カレンダーイベント終了時間</string>
 	<string name="EPr_cal_start_at_due_time">カレンダーイベント開始時間</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 0b1053ea2..18c4d80a3 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -199,7 +199,6 @@
 	<string name="EPr_fullTask_desc_enabled">전체 일정 제목을 표시합니다</string>
 	<string name="EPr_fullTask_desc_disabled">일정 제목의 첫 두 줄을 표시합니다</string>
 	<string name="EPr_show_task_edit_comments">일정 편집에서 댓글 보기</string>
-	<string name="EPr_taskRowPrefs_title">일정 표시줄 보기 설정</string>
 	<string name="EPr_cal_end_or_start_at_due_time">달력 이벤트 시간</string>
 	<string name="EPr_cal_end_at_due_time">설정한 시간에 달력 이벤트 종료</string>
 	<string name="EPr_cal_start_at_due_time">설정한 시간에 달력 이벤트 시작</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index ec32a7a09..ee5cc5853 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -196,7 +196,6 @@
 	<string name="EPr_fullTask_desc_enabled">Volledige taak titel zal worden weergegeven</string>
 	<string name="EPr_fullTask_desc_disabled">Eerste twee lijnen van taak titel zullen worden weergegeven</string>
 	<string name="EPr_show_task_edit_comments">Toon opmerkingen in taak bewerken</string>
-	<string name="EPr_taskRowPrefs_title">Taakrij Weergave</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Agenda item tijd</string>
 	<string name="EPr_cal_end_at_due_time">Agenda item op tijd afronden</string>
 	<string name="EPr_cal_start_at_due_time">Agenda item op tijd starten</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 1ce9f7735..59411c918 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -196,7 +196,6 @@
 	<string name="EPr_fullTask_desc_enabled">Pełna nazwa zadania będzie wyświetlana</string>
 	<string name="EPr_fullTask_desc_disabled">Pierwsze dwie linie nazwy zadania będą wyświetlane</string>
 	<string name="EPr_show_task_edit_comments">Pokaż komentarze w edycji zadania</string>
-	<string name="EPr_taskRowPrefs_title">Wygląd rzędu zadań</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Czas zdarzenia kalendarza</string>
 	<string name="EPr_cal_end_at_due_time">Zakończ zadania kalendarza w ustalonym czasie</string>
 	<string name="EPr_cal_start_at_due_time">Rozpocznij zadania kalendarza w ustalonym czasie</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index d1e6d6588..bf380c127 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -196,7 +196,6 @@
 	<string name="EPr_fullTask_desc_enabled">O título completo será exibido</string>
 	<string name="EPr_fullTask_desc_disabled">Somente as primeiras duas linhas serão exibidas</string>
 	<string name="EPr_show_task_edit_comments">Mostrar comentários na edição de tarefas</string>
-	<string name="EPr_taskRowPrefs_title">Aparência da Tarefa</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Hora do evento</string>
 	<string name="EPr_cal_end_at_due_time">Eventos da agenda terminou no devido tempo</string>
 	<string name="EPr_cal_start_at_due_time">Eventos da agenda iniciaram no devido tempo</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index ada7e98a4..91b957fc5 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -197,7 +197,6 @@
 	<string name="EPr_fullTask_desc_enabled">O título completo das tarefas será mostrado</string>
 	<string name="EPr_fullTask_desc_disabled">Primeiras duas linhas do título serão mostradas</string>
 	<string name="EPr_show_task_edit_comments">Mostrar comentários na edição de tarefa</string>
-	<string name="EPr_taskRowPrefs_title">Aspeto da linha de tarefa</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Hora do evento de calendário</string>
 	<string name="EPr_cal_end_at_due_time">Terminar evento do calendário na hora limite</string>
 	<string name="EPr_cal_start_at_due_time">Iniciar eventos de calendário na hora limite</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 4225cab13..2f3e53ad5 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -198,7 +198,6 @@
 	<string name="EPr_fullTask_desc_enabled">Будет показано полное название задачи</string>
 	<string name="EPr_fullTask_desc_disabled">Будут показаны первые две строки названия</string>
 	<string name="EPr_show_task_edit_comments">Показывать комментарии в редакторе задачи</string>
-	<string name="EPr_taskRowPrefs_title">Внешний вид задач в списке</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Время события в календаре</string>
 	<string name="EPr_cal_end_at_due_time">Завершать события в календаре при наступлении срока</string>
 	<string name="EPr_cal_start_at_due_time">Создавать события в календаре при наступлении срока</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 0de575ce5..22d9806dc 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -199,7 +199,6 @@
 	<string name="EPr_fullTask_desc_enabled">Celoten naziv opravka bo prikazan</string>
 	<string name="EPr_fullTask_desc_disabled">Prikazani bosta prvi dve vrstici naziva opravka</string>
 	<string name="EPr_show_task_edit_comments">Prikaži opombe pri urejanju opravkov</string>
-	<string name="EPr_taskRowPrefs_title">Izgled vrstic z opravki</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Čas dogodka iz koledarja</string>
 	<string name="EPr_cal_end_at_due_time">Končaj dogodke na koledarju ob dospelosti</string>
 	<string name="EPr_cal_start_at_due_time">Začni dogodke na koledarju ob dospelosti</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 6f783fdec..9c9e62652 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -193,7 +193,6 @@
 	<string name="EPr_fullTask_desc_enabled">Uppgiftens namn kommer att visas i sin helhet</string>
 	<string name="EPr_fullTask_desc_disabled">De första två raderna i uppgiftens namn kommer att visas</string>
 	<string name="EPr_show_task_edit_comments">Vissa kommentarer i uppgiftsredigering</string>
-	<string name="EPr_taskRowPrefs_title">Utseende på uppgiftsraden</string>
 	<string name="EPr_manage_header">Hantera gamla uppgifter</string>
 	<string name="EPr_manage_delete_completed">Radera färdiga uppgifter</string>
 	<string name="EPr_manage_delete_completed_message">Vill du verkligen radera alla dina färdiga uppgifter?</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 58dacdbf3..d1dfd4ef9 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -175,7 +175,6 @@
 	<string name="EPr_fullTask_title">Tüm görev başlığını göster</string>
 	<string name="EPr_fullTask_desc_enabled">Tüm görev başlığı gösterilecek</string>
 	<string name="EPr_fullTask_desc_disabled">Görev başlığının ilk iki satırı gösterilecek</string>
-	<string name="EPr_taskRowPrefs_title">Görev Sırası Görünümü</string>
 	<string name="EPr_manage_header">Eski Görevleri Yönet</string>
 	<string name="EPr_manage_delete_completed">Tamamlanan Görevleri Sil</string>
 	<string name="EPr_manage_delete_completed_message">Gerçekten tüm tamamlanmış görevleri silmek istiyor musun?</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index efe00237b..8592d7e7f 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -199,7 +199,6 @@
 	<string name="EPr_fullTask_desc_enabled">Повна назва завдання буде показана</string>
 	<string name="EPr_fullTask_desc_disabled">Перші дві стрічки назви завдання будуть показані</string>
 	<string name="EPr_show_task_edit_comments">Показувати коментарі в редакторі завдання</string>
-	<string name="EPr_taskRowPrefs_title">Зовнішній вигляд завдань у списку</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Час події в календарі</string>
 	<string name="EPr_cal_end_at_due_time">Завершення календарної події при настанні терміну</string>
 	<string name="EPr_cal_start_at_due_time">Початок календарної події при настанні терміну</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 2a0b789e5..bdfe01853 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -157,7 +157,6 @@
 	<string name="EPr_fullTask_title">显示完整的任务标题</string>
 	<string name="EPr_fullTask_desc_enabled">将显示完整的任务标题</string>
 	<string name="EPr_fullTask_desc_disabled">将显示任务标题的头两行</string>
-	<string name="EPr_taskRowPrefs_title">任务栏</string>
 	<string name="EPr_manage_header">管理旧任务</string>
 	<string name="EPr_manage_delete_completed">删除已完成任务</string>
 	<string name="EPr_manage_delete_completed_message">您真的要删除所有已完成任务吗？</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 9a95f2b87..c01382062 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -189,7 +189,6 @@
 	<string name="EPr_fullTask_title">顯示完整的任務工作標題</string>
 	<string name="EPr_fullTask_desc_enabled">將顯示完整的任務工作標題</string>
 	<string name="EPr_fullTask_desc_disabled">將顯示任務工作標題的頭兩行</string>
-	<string name="EPr_taskRowPrefs_title">任務工作欄</string>
 	<string name="EPr_manage_header">管理舊任務工作</string>
 	<string name="EPr_manage_delete_completed">刪除已完成任務工作</string>
 	<string name="EPr_manage_delete_completed_message">您真的要刪除所有已完成任務工作嗎？</string>
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 0dc1e0196..7d4203b13 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -57,7 +57,6 @@
   <string name="p_calendar_reminders">p_calendar_reminder</string>
 
   <!-- filters to show -->
-  <string name="p_filters_to_show">p_filters_to_show</string>
   <string name="p_show_my_tasks_filter">p_show_my_tasks_f</string>
   <string name="p_show_today_filter">p_show_today_f</string>
   <string name="p_show_recently_modified_filter">p_show_recently_modified_f</string>
@@ -114,13 +113,9 @@
   </string-array>
   
   <string name="p_showSmartConfirmation_key">showSmartConfirmation</string>
-  
-  <string name="p_taskRowPrefs">taskRowPrefs</string>
-  
+
   <string name="p_fullTaskTitle">fullTaskTitle</string>
   
-  <string name="p_edit_screen">p_edit_screen</string>
-  
   <string name="p_time_increment">p_time_increment</string>
   
   <string name="p_show_timer_shortcut">p_show_timer_shortcut</string>
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index 6ec8cf811..0ce996907 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -459,10 +459,9 @@
 
   <!-- Preference: task edit comments -->
   <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Task row appearance</string>
-  
+
+    <string name="task_list_options">Task list options</string>
+
   <!-- Preferences: calendar event start time -->
   <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
   <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 712f376ee..9f469de06 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -16,48 +16,44 @@
             android:key="@string/p_use_dark_theme"
             android:defaultValue="false" />
 
-        <PreferenceScreen android:title="@string/EPr_taskRowPrefs_title" android:key="@string/p_taskRowPrefs">
-        
-	        <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" />
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_fullTaskTitle"
+        <PreferenceCategory android:title="@string/task_list_options">
+            <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" />
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                android:key="@string/p_fullTaskTitle"
                 android:summaryOff="@string/EPr_fullTask_desc_disabled"
                 android:summaryOn="@string/EPr_fullTask_desc_enabled"
-	            android:title="@string/EPr_fullTask_title"
-	            android:defaultValue="false" />
+                android:title="@string/EPr_fullTask_title"
+                android:defaultValue="false" />
+
+        </PreferenceCategory>
+
+        <PreferenceCategory android:title="@string/EPr_edit_screen_options">
+            <PreferenceScreen android:title="@string/EPr_beastMode_title"
+                android:key="@string/p_beastMode"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                android:key="@string/p_show_task_edit_comments"
+                android:title="@string/EPr_show_task_edit_comments"
+                android:defaultValue="true"/>
 
-        </PreferenceScreen>
-        
-        <PreferenceScreen android:title="@string/EPr_edit_screen_options" 
-                android:key="@string/p_edit_screen">
-	        
-	        <PreferenceScreen android:title="@string/EPr_beastMode_title" 
-	            android:key="@string/p_beastMode"/>
-	            
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_show_task_edit_comments"
-	            android:title="@string/EPr_show_task_edit_comments"
-	            android:defaultValue="true"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
                 android:key="@string/p_time_increment"
                 android:title="@string/EPr_time_increment"
                 android:defaultValue="true"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_show_timer_shortcut"
-	            android:title="@string/EPr_show_timer_shortcut"
-	            android:defaultValue="false"/>
-            
-        </PreferenceScreen>
-        
-        <PreferenceScreen android:title="@string/EPr_filters_to_show_title" android:key="@string/p_filters_to_show">
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                android:key="@string/p_show_timer_shortcut"
+                android:title="@string/EPr_show_timer_shortcut"
+                android:defaultValue="false"/>
+        </PreferenceCategory>
+
+        <PreferenceCategory android:title="@string/EPr_filters_to_show_title">
             <com.todoroo.astrid.ui.MultilineCheckboxPreference
                 android:key="@string/p_show_my_tasks_filter"
                 android:title="@string/BFE_Active"
@@ -75,12 +71,7 @@
                 android:key="@string/p_show_not_in_list_filter"
                 android:title="@string/tag_FEx_untagged"
                 android:defaultValue="true"/>
-        </PreferenceScreen>
-
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_showSmartConfirmation_key"
-            android:title="@string/EPr_showSmartConfirmation_title"
-            android:defaultValue="true"/>
+        </PreferenceCategory>
 
     </PreferenceScreen>
 
diff --git a/src/main/res/xml/preferences_misc.xml b/src/main/res/xml/preferences_misc.xml
index 8dfedd1e3..87ecd50ae 100644
--- a/src/main/res/xml/preferences_misc.xml
+++ b/src/main/res/xml/preferences_misc.xml
@@ -34,6 +34,11 @@
             android:summaryOn="@string/EPr_cal_start_at_due_time"
 	        android:key = "@string/p_end_at_deadline" />
 
+        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+            android:key="@string/p_showSmartConfirmation_key"
+            android:title="@string/EPr_showSmartConfirmation_title"
+            android:defaultValue="true"/>
+
         <CheckBoxPreference
             android:title="@string/debug_logging"
             android:key="@string/p_debug_logging"/>