Update beast mode layout

src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java

@@ -7,20 +7,25 @@ package com.todoroo.astrid.activity;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.commonsware.cwac.tlv.TouchListView;
 import com.commonsware.cwac.tlv.TouchListView.DropListener;
 
 import org.tasks.R;
-import org.tasks.injection.InjectingListActivity;
+import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.preferences.ActivityPreferences;
 import org.tasks.preferences.Preferences;
 
@@ -30,7 +35,13 @@ import java.util.HashMap;
 
 import javax.inject.Inject;
 
-public class BeastModePreferences extends InjectingListActivity {
+import butterknife.Bind;
+import butterknife.ButterKnife;
+
+public class BeastModePreferences extends InjectingAppCompatActivity {
+
+    @Bind(R.id.toolbar) Toolbar toolbar;
+    @Bind(android.R.id.list) TouchListView touchList;
 
     private ArrayAdapter<String> adapter;
 
@@ -47,14 +58,29 @@ public class BeastModePreferences extends InjectingListActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        preferences.applyLightStatusBarColor();
+        preferences.applyThemeAndStatusBarColor();
         setContentView(R.layout.beast_mode_pref_activity);
-        setTitle(R.string.EPr_beastMode_desc);
+        ButterKnife.bind(this);
+
+        setSupportActionBar(toolbar);
+        ActionBar supportActionBar = getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+            supportActionBar.setDisplayShowTitleEnabled(false);
+            Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_arrow_back_24dp));
+            DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white));
+            supportActionBar.setHomeAsUpIndicator(drawable);
+        }
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
 
         prefsToDescriptions = new HashMap<>();
         buildDescriptionMap(getResources());
 
-        TouchListView touchList = (TouchListView) getListView();
         items = constructOrderedControlList(preferences, this);
 
         adapter = new ArrayAdapter<String>(this, R.layout.preference_draggable_row, R.id.text, items) {
@@ -73,7 +99,6 @@ public class BeastModePreferences extends InjectingListActivity {
                 return false;
             }
         });
-
         touchList.setDropListener(new DropListener() {
             @Override
             public void drop(int from, int to) {
@@ -82,14 +107,23 @@ public class BeastModePreferences extends InjectingListActivity {
                 adapter.notifyDataSetChanged();
             }
         });
+    }
 
-        Button resetButton = (Button) findViewById(R.id.reset);
-        resetButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.beast_mode, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case R.id.menu_reset_to_defaults:
                 resetToDefault();
-            }
-        });
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
     }
 
     private void buildDescriptionMap(Resources r) {
@@ -111,12 +145,17 @@ public class BeastModePreferences extends InjectingListActivity {
 
     @Override
     public void finish() {
-        StringBuilder newSetting = new StringBuilder(30);
+        StringBuilder newSetting = new StringBuilder();
         for (int i = 0; i < adapter.getCount(); i++) {
             newSetting.append(adapter.getItem(i));
             newSetting.append(BEAST_MODE_PREF_ITEM_SEPARATOR);
         }
-        preferences.setString(BEAST_MODE_ORDER_PREF, newSetting.toString());
+        String oldValue = preferences.getStringValue(BEAST_MODE_ORDER_PREF);
+        String newValue = newSetting.toString();
+        if (!oldValue.equals(newValue)) {
+            preferences.setString(BEAST_MODE_ORDER_PREF, newSetting.toString());
+            setResult(RESULT_OK);
+        }
         super.finish();
     }
 
@@ -126,7 +165,7 @@ public class BeastModePreferences extends InjectingListActivity {
         }
 
         ArrayList<String> list = constructOrderedControlList(preferences, context);
-        StringBuilder newSetting = new StringBuilder(30);
+        StringBuilder newSetting = new StringBuilder();
         for (String item : list) {
             newSetting.append(item);
             newSetting.append(BEAST_MODE_PREF_ITEM_SEPARATOR);
@@ -163,5 +202,4 @@ public class BeastModePreferences extends InjectingListActivity {
         }
         return list;
     }
-
 }

src/main/java/org/tasks/preferences/AppearancePreferences.java

@@ -4,33 +4,77 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 
+import com.todoroo.astrid.activity.BeastModePreferences;
+
 import org.tasks.R;
 import org.tasks.injection.InjectingPreferenceActivity;
 
 public class AppearancePreferences extends InjectingPreferenceActivity {
 
-    public static String FORCE_REFRESH = "force_refresh";
-    public static String FILTERS_CHANGED = "filters_changed";
+    private static final int REQUEST_CUSTOMIZE = 1004;
+
+    private static final String EXTRA_BUNDLE = "extra_bundle";
+    public static String EXTRA_RESTART = "extra_restart";
+    public static String EXTRA_FILTERS_CHANGED = "extra_filters_changed";
+
+    private Bundle result;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        result = savedInstanceState == null
+                ? new Bundle()
+                : savedInstanceState.getBundle(EXTRA_BUNDLE);
+
         addPreferencesFromResource(R.xml.preferences_appearance);
 
-        setExtraOnChange(R.string.p_use_dark_theme, FORCE_REFRESH);
-        setExtraOnChange(R.string.p_fontSize, FORCE_REFRESH);
-        setExtraOnChange(R.string.p_fullTaskTitle, FORCE_REFRESH);
-        setExtraOnChange(R.string.p_show_today_filter, FILTERS_CHANGED);
-        setExtraOnChange(R.string.p_show_recently_modified_filter, FILTERS_CHANGED);
-        setExtraOnChange(R.string.p_show_not_in_list_filter, FILTERS_CHANGED);
+        setExtraOnChange(R.string.p_use_dark_theme, EXTRA_RESTART);
+        setExtraOnChange(R.string.p_fontSize, EXTRA_RESTART);
+        setExtraOnChange(R.string.p_fullTaskTitle, EXTRA_RESTART);
+        setExtraOnChange(R.string.p_show_today_filter, EXTRA_FILTERS_CHANGED);
+        setExtraOnChange(R.string.p_show_recently_modified_filter, EXTRA_FILTERS_CHANGED);
+        setExtraOnChange(R.string.p_show_not_in_list_filter, EXTRA_FILTERS_CHANGED);
+        findPreference(getString(R.string.customize_edit_screen)).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                startActivityForResult(new Intent(AppearancePreferences.this, BeastModePreferences.class), REQUEST_CUSTOMIZE);
+                return true;
+            }
+        });
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putBundle(EXTRA_BUNDLE, result);
+    }
+
+    @Override
+    public void finish() {
+        setResult(RESULT_OK, new Intent() {{
+            putExtras(result);
+        }});
+        super.finish();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CUSTOMIZE) {
+            if (resultCode == RESULT_OK) {
+                result.putBoolean(EXTRA_RESTART, true);
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
     }
 
     private void setExtraOnChange(int resId, final String extra) {
         findPreference(getString(resId)).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
-                setResult(RESULT_OK, new Intent().putExtra(extra, true));
+                result.putBoolean(extra, true);
                 return true;
             }
         });

src/main/java/org/tasks/ui/NavigationDrawerFragment.java

@@ -82,10 +82,10 @@ public class NavigationDrawerFragment extends InjectingFragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == FilterAdapter.REQUEST_SETTINGS && resultCode == Activity.RESULT_OK && data != null) {
-            if (data.getBooleanExtra(AppearancePreferences.FILTERS_CHANGED, false)) {
+            if (data.getBooleanExtra(AppearancePreferences.EXTRA_FILTERS_CHANGED, false)) {
                 refresh();
             }
-            if (data.getBooleanExtra(AppearancePreferences.FORCE_REFRESH, false)) {
+            if (data.getBooleanExtra(AppearancePreferences.EXTRA_RESTART, false)) {
                 getActivity().finish();
                 getActivity().startActivity(getActivity().getIntent());
                 refresh();

src/main/res/layout/beast_mode_pref_activity.xml

@@ -9,14 +9,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="?asContentBackground">
-    
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dip"
-        android:textSize="16sp"
-        android:text="@string/EPr_beastMode_hint"/>
-    
+
+    <include layout="@layout/toolbar" />
+
+    <include layout="@layout/toolbar_separator" />
+
     <com.commonsware.cwac.tlv.TouchListView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tlv="http://schemas.android.com/apk/res/org.tasks"
@@ -31,11 +28,4 @@
         
         tlv:normal_height="52dip"
         tlv:grabber="@+id/row_body" />
-    
-    <Button
-        android:id="@+id/reset"
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:text="@string/EPr_beastMode_reset"/>
-    
 </LinearLayout>

src/main/res/menu/beast_mode.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tasks="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_reset_to_defaults"
+        android:title="@string/EPr_beastMode_reset"
+        tasks:showAsAction="ifRoom" />
+</menu>

src/main/res/values-bg-rBG/strings.xml

@@ -115,9 +115,7 @@
 	<string name="EPr_appearance_header">Изглед</string>
 	<string name="EPr_filters_to_show_title">Филтри за показване</string>
 	<string name="EPr_edit_screen_options">Редактиране на опциите екрана</string>
-	<string name="EPr_beastMode_desc">Настройване изгледа на екрана за редактиране на задача</string>
 	<string name="EPr_beastMode_reset">Възстанови по подразбиране</string>
-	<string name="EPr_beastMode_hint">Настройване изгледа на екрана за редактиране на задача чрез изтегляне на елементите във всеки ред</string>
 	<string name="EPr_fullTask_title">Покажи пълното име на задачата</string>
 	<string name="EPr_show_task_edit_comments">Покажи коментари при редакция на задача</string>
 	<string name="task_list_options">Списък с опции към задача</string>

src/main/res/values-de/strings.xml

@@ -110,9 +110,7 @@
 	<string name="EPr_appearance_header">Erscheinungsbild</string>
 	<string name="EPr_filters_to_show_title">Angezeigte Filter</string>
 	<string name="EPr_edit_screen_options">Bildschirmeinstellungen bearbeiten</string>
-	<string name="EPr_beastMode_desc">Erscheinungsbild Aufgabenseite anpassen</string>
 	<string name="EPr_beastMode_reset">Auf Standardeinstellungen zurücksetzen</string>
-	<string name="EPr_beastMode_hint">Du kannst die Eingabeseite für Aufgaben mit den Schiebereglern links anpassen</string>
 	<string name="EPr_fullTask_title">Gesamten Aufgabentitel anzeigen</string>
 	<string name="EPr_show_task_edit_comments">Kommentare bei Aufgabeneingabe anzeigen </string>
 	<string name="task_list_options">Aufgabenlistenoptionen</string>

src/main/res/values-el/strings.xml

@@ -100,9 +100,7 @@
 	<string name="EPr_appearance_header">Εμφάνιση</string>
 	<string name="EPr_filters_to_show_title">Φίλτρα για εμφάνιση</string>
 	<string name="EPr_edit_screen_options">Επεξεργασία επιλογών εμφάνισης</string>
-	<string name="EPr_beastMode_desc">Προσαρμόστε τη διάταξη της οθόνης επεξεργασίας της εργασίας</string>
 	<string name="EPr_beastMode_reset">Επαναφορά προεπιλογών</string>
-	<string name="EPr_beastMode_hint">Προσαρμόστε τη διάταξη της οθόνης επεξεργασίας της εργασίας τραβώντας την αριστερή λαβή σε κάθε σειρά</string>
 	<string name="EPr_fullTask_title">Εμφάνισε πλήρη τίτλο εργασίας</string>
 	<string name="EPr_show_task_edit_comments">Εμφάνιση σχόλιων στην επεξεργασία εργασίας</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Ώρα γεγονότος ημερολογίου</string>

src/main/res/values-es/strings.xml

@@ -110,9 +110,7 @@
 	<string name="EPr_appearance_header">Apariencia</string>
 	<string name="EPr_filters_to_show_title">Filtros a mostrar</string>
 	<string name="EPr_edit_screen_options">Editar opciones de pantalla</string>
-	<string name="EPr_beastMode_desc">Personalizar la disposición de la pantalla de edición de tareas</string>
 	<string name="EPr_beastMode_reset">Restablecer valores predeterminados</string>
-	<string name="EPr_beastMode_hint">Personalice su pantalla de edición de tareas arrastrando el asa izquierda en cada fila</string>
 	<string name="EPr_fullTask_title">Mostrar completo el título de la tarea</string>
 	<string name="EPr_show_task_edit_comments">Mostrar comentarios durante la edición de tareas</string>
 	<string name="task_list_options">Opciones de la lista de tareas</string>

src/main/res/values-fa/strings.xml

@@ -77,7 +77,6 @@
 	<string name="EPr_appearance_header">ظاهر</string>
 	<string name="EPr_filters_to_show_title">فیلترها برای نمایش</string>
 	<string name="EPr_edit_screen_options">ویرایش تنظیمات صفحه</string>
-	<string name="EPr_beastMode_desc">شخصی سازی قالب صفحه ویرایش وظیفه</string>
 	<string name="EPr_beastMode_reset">برگرداندن به پیش فرض</string>
 	<string name="EPr_fullTask_title">نمایش عنوان کامل وظیفه</string>
 	<string name="task_list_options">اختیارات لیست وظیفه</string>

src/main/res/values-fr/strings.xml

@@ -109,9 +109,7 @@
 	<string name="EPr_appearance_header">Apparence</string>
 	<string name="EPr_filters_to_show_title">Filtres à afficher</string>
 	<string name="EPr_edit_screen_options">Edition des options d\'affichage</string>
-	<string name="EPr_beastMode_desc">Personnaliser la disposition de l\'écran d\'édition de tâche</string>
 	<string name="EPr_beastMode_reset">Rétablir les valeurs par défaut</string>
-	<string name="EPr_beastMode_hint">Personnalisez votre écran d\'ajout de tâche en faisant glisser chaque ligne vers la gauche</string>
 	<string name="EPr_fullTask_title">Voir le titre complet de la tâche</string>
 	<string name="EPr_show_task_edit_comments">Afficher les commentaires dans l\'édition de tâches</string>
 	<string name="task_list_options">Options de la liste des tâches</string>

src/main/res/values-it/strings.xml

@@ -112,9 +112,7 @@
 	<string name="EPr_appearance_header">Aspetto</string>
 	<string name="EPr_filters_to_show_title">Filtri da visualizzare</string>
 	<string name="EPr_edit_screen_options">Modifica opzioni schermo</string>
-	<string name="EPr_beastMode_desc">Personalizza il layout della schermata di modifica attività</string>
 	<string name="EPr_beastMode_reset">Ripristina predefiniti</string>
-	<string name="EPr_beastMode_hint">Personalizza la schermata di modifica attività trascinando l’indicatore a sinistra di ogni riga</string>
 	<string name="EPr_fullTask_title">Visualizza titolo completo dell\'attività</string>
 	<string name="EPr_show_task_edit_comments">Mostra i commenti in modifica</string>
 	<string name="task_list_options">Opzioni elenco attività</string>

src/main/res/values-iw/strings.xml

@@ -99,7 +99,6 @@
 	<string name="EPr_appearance_header">חזות</string>
 	<string name="EPr_filters_to_show_title">אילו מַסְנְנִים להציג</string>
 	<string name="EPr_edit_screen_options">עריכת אפשרויות מסך</string>
-	<string name="EPr_beastMode_desc">התאם אישית את מסך עריכת משימה</string>
 	<string name="EPr_beastMode_reset">אפס להגדרות ברירת מחדל</string>
 	<string name="EPr_fullTask_title">הצג כותרת מלאה</string>
 	<string name="EPr_show_task_edit_comments">הצגת הערות בעריכת משימה</string>

src/main/res/values-ja/strings.xml

@@ -112,9 +112,7 @@
 	<string name="EPr_appearance_header">外観</string>
 	<string name="EPr_filters_to_show_title">表示のフィルター</string>
 	<string name="EPr_edit_screen_options">編集画面オプション</string>
-	<string name="EPr_beastMode_desc">タスク編集画面のレイアウトをカスタマイズ</string>
 	<string name="EPr_beastMode_reset">デフォルトにリセット</string>
-	<string name="EPr_beastMode_hint">各行の左側をドラッグしてタスク編集画面をカスタマイズしてください</string>
 	<string name="EPr_fullTask_title">完全なタスク見出しを表示</string>
 	<string name="EPr_show_task_edit_comments">タスク編集でコメントを表示</string>
 	<string name="task_list_options">タスクリスト オプション</string>

src/main/res/values-ko/strings.xml

@@ -114,9 +114,7 @@
 	<string name="EPr_appearance_header">보기 설정</string>
 	<string name="EPr_filters_to_show_title">표시할 필터</string>
 	<string name="EPr_edit_screen_options">화면 설정 편집하기</string>
-	<string name="EPr_beastMode_desc">일정 편집화면 레이아웃 설정하기</string>
 	<string name="EPr_beastMode_reset">기본값으로 초기화하기</string>
-	<string name="EPr_beastMode_hint">각 줄의 왼쪽 손잡이를 끌어서 일정 편집 화면을 사용자 정의하기</string>
 	<string name="EPr_fullTask_title">전체 일정 제목 보기</string>
 	<string name="EPr_show_task_edit_comments">일정 편집에서 댓글 보기</string>
 	<string name="task_list_options">일정 목록 옵션</string>

src/main/res/values-nl/strings.xml

@@ -112,9 +112,7 @@
 	<string name="EPr_appearance_header">Uiterlijk</string>
 	<string name="EPr_filters_to_show_title">Te tonen filters</string>
 	<string name="EPr_edit_screen_options">Scherm opties bewerken</string>
-	<string name="EPr_beastMode_desc">Pas de layout van het Taak Wijzigingsscherm aan</string>
 	<string name="EPr_beastMode_reset">Standaardinstellingen herstellen</string>
-	<string name="EPr_beastMode_hint">Pas uw taak bewerken scherm aan door de linker handle van elke rij te verslepen</string>
 	<string name="EPr_fullTask_title">Laat volledige taak titel zien</string>
 	<string name="EPr_show_task_edit_comments">Toon opmerkingen in taak bewerken</string>
 	<string name="task_list_options">Takenlijst opties</string>

src/main/res/values-pl/strings.xml

@@ -99,9 +99,7 @@
 	<string name="EPr_appearance_header">Wygląd</string>
 	<string name="EPr_filters_to_show_title">Pokazywane filtry</string>
 	<string name="EPr_edit_screen_options">Edytuj ustawienia ekranu</string>
-	<string name="EPr_beastMode_desc">Dostosuj układ strony edycji zadania</string>
 	<string name="EPr_beastMode_reset">Przywróć domyślne</string>
-	<string name="EPr_beastMode_hint">Dostosuj swój ekran edycji zadania przez przeciąganie za uchwyt po prawej w każdym wierszu</string>
 	<string name="EPr_fullTask_title">Pokaż pełną nazwę zadania</string>
 	<string name="EPr_show_task_edit_comments">Pokaż komentarze w edycji zadania</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Czas zdarzenia kalendarza</string>

src/main/res/values-pt-rBR/strings.xml

@@ -99,9 +99,7 @@
 	<string name="EPr_appearance_header">Aparência</string>
 	<string name="EPr_filters_to_show_title">Filtros a mostrar</string>
 	<string name="EPr_edit_screen_options">Editar opções da tela</string>
-	<string name="EPr_beastMode_desc">Personalize o layout da tela de edição</string>
 	<string name="EPr_beastMode_reset">Restaurar valores padrão</string>
-	<string name="EPr_beastMode_hint">Personalize suas tarefas na tela de edição arrastando-as para a esquerda</string>
 	<string name="EPr_fullTask_title">Exibir título completo</string>
 	<string name="EPr_show_task_edit_comments">Mostrar comentários na edição de tarefas</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Hora do evento</string>

src/main/res/values-pt/strings.xml

@@ -110,9 +110,7 @@
 	<string name="EPr_appearance_header">Aspeto</string>
 	<string name="EPr_filters_to_show_title">Filtros a mostrar</string>
 	<string name="EPr_edit_screen_options">Opções do ecrã de edição</string>
-	<string name="EPr_beastMode_desc">Personalizar o esquema do ecrã de edição de tarefas</string>
 	<string name="EPr_beastMode_reset">Restaurar definições originas</string>
-	<string name="EPr_beastMode_hint">Personalize o ecrã de edição de tarefas arrastando a guia em cada linha</string>
 	<string name="EPr_fullTask_title">Mostrar título completo das tarefas</string>
 	<string name="EPr_show_task_edit_comments">Mostrar comentários na edição de tarefa</string>
 	<string name="task_list_options">Opções da lista de tarefas</string>

src/main/res/values-ru/strings.xml

@@ -112,9 +112,7 @@
 	<string name="EPr_appearance_header">Интерфейс</string>
 	<string name="EPr_filters_to_show_title">Показать фильтры</string>
 	<string name="EPr_edit_screen_options">Редактировать настройки экрана</string>
-	<string name="EPr_beastMode_desc">Настроить внешний вид экрана правки задачи</string>
 	<string name="EPr_beastMode_reset">Настройки по умолчанию</string>
-	<string name="EPr_beastMode_hint">Настройте экран редактирования задачи, перетаскивая элементы</string>
 	<string name="EPr_fullTask_title">Показывать полное название задачи</string>
 	<string name="EPr_show_task_edit_comments">Показывать комментарии в редакторе задачи</string>
 	<string name="task_list_options">Настройка списка задач</string>

src/main/res/values-sk/strings.xml

@@ -108,9 +108,7 @@
 	<string name="EPr_appearance_header">Vzhľad</string>
 	<string name="EPr_filters_to_show_title">Filtre pre zobrazenie</string>
 	<string name="EPr_edit_screen_options">Možnosti úprav zobrazenia</string>
-	<string name="EPr_beastMode_desc">Prispôsobiť rozvrhnutie zobrazenia úpravy úloh</string>
 	<string name="EPr_beastMode_reset">Obnoviť na predvolené</string>
-	<string name="EPr_beastMode_hint">Prispôsob si rozvrhnutie zobrazenia úpravy úloh potiahnutím ľavej rukoväte na každom riadku</string>
 	<string name="EPr_fullTask_title">Zobraziť celý názov úlohy</string>
 	<string name="EPr_show_task_edit_comments">Zobraziť komentáre pri úprave úlohy</string>
 	<string name="task_list_options">Nastavenia zoznamu úloh</string>

src/main/res/values-sl-rSI/strings.xml

@@ -104,9 +104,7 @@
 	<string name="EPr_appearance_header">Izgled</string>
 	<string name="EPr_filters_to_show_title">Filtri za prikaz</string>
 	<string name="EPr_edit_screen_options">Uredi možnosti zaslona</string>
-	<string name="EPr_beastMode_desc">Po meri postavi stran za urejevanje opravkov </string>
 	<string name="EPr_beastMode_reset">Povrni privzeto nastavitev</string>
-	<string name="EPr_beastMode_hint">Stran za urejanje opravkov se postavi po meri s potegom leve ročke posamezne vrstice</string>
 	<string name="EPr_fullTask_title">Prikaži celoten naziv opravka</string>
 	<string name="EPr_show_task_edit_comments">Prikaži opombe pri urejanju opravkov</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Čas dogodka iz koledarja</string>

src/main/res/values-sv/strings.xml

@@ -98,7 +98,6 @@
 	<string name="EPr_appearance_header">Utseende</string>
 	<string name="EPr_filters_to_show_title">Filter att visa</string>
 	<string name="EPr_edit_screen_options">Ändra skärminställningar</string>
-	<string name="EPr_beastMode_desc">Ställ in layouten för uppgiftsredigeringsrutan</string>
 	<string name="EPr_beastMode_reset">Återställ till standardvärden</string>
 	<string name="EPr_fullTask_title">Visa hela namnet på uppgiften</string>
 	<string name="EPr_show_task_edit_comments">Vissa kommentarer i uppgiftsredigering</string>

src/main/res/values-tr/strings.xml

@@ -83,7 +83,6 @@
 	<string name="CRA_dont_invite">Hayır teşekkürler</string>
 	<string name="CRA_list_created_title">Liste oluşturuldu!</string>
 	<string name="EPr_appearance_header">Görünüm</string>
-	<string name="EPr_beastMode_desc">Görev Düzenleme Ekranı yerleşimini özelleştir</string>
 	<string name="EPr_beastMode_reset">Varsayılanlara sıfırla</string>
 	<string name="EPr_fullTask_title">Tüm görev başlığını göster</string>
 	<string name="EPr_manage_header">Eski Görevleri Yönet</string>

src/main/res/values-uk/strings.xml

@@ -106,9 +106,7 @@
 	<string name="EPr_appearance_header">Інтерфейс</string>
 	<string name="EPr_filters_to_show_title">Показати фільтри</string>
 	<string name="EPr_edit_screen_options">Редагувати налаштування екрану</string>
-	<string name="EPr_beastMode_desc">Налаштувати зовнішній вигляд екрану редагування завдань</string>
 	<string name="EPr_beastMode_reset">Налаштування за замовчуванням</string>
-	<string name="EPr_beastMode_hint">Налаштуйте Ваш екран редагування нотатки перетягуванням лівої частини рядків</string>
 	<string name="EPr_fullTask_title">Показувати повну назву завдання</string>
 	<string name="EPr_show_task_edit_comments">Показувати коментарі в редакторі завдання</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Час події в календарі</string>

src/main/res/values-zh-rCN/strings.xml

@@ -66,7 +66,6 @@
 	<string name="CRA_create_list">创建列表</string>
 	<string name="CRA_postpone">也许以后</string>
 	<string name="EPr_appearance_header">外观</string>
-	<string name="EPr_beastMode_desc">自定义设定菜单屏幕</string>
 	<string name="EPr_beastMode_reset">恢复默认值</string>
 	<string name="EPr_fullTask_title">显示完整的任务标题</string>
 	<string name="EPr_manage_header">管理旧任务</string>

src/main/res/values-zh-rTW/strings.xml

@@ -93,7 +93,6 @@
 	<string name="CRA_default_list_name">行動事項：%s</string>
 	<string name="EPr_appearance_header">外觀</string>
 	<string name="EPr_edit_screen_options">編輯畫面選項</string>
-	<string name="EPr_beastMode_desc">自定義設定菜單屏幕</string>
 	<string name="EPr_beastMode_reset">恢復默認值</string>
 	<string name="EPr_fullTask_title">顯示完整的任務工作標題</string>
 	<string name="EPr_manage_header">管理舊任務工作</string>

src/main/res/values/strings.xml

@@ -339,13 +339,9 @@ File %1$s contained %2$s.\n\n
     <!-- Edit screen preference category -->
     <string name="EPr_edit_screen_options">Edit screen options</string>
 
-    <!-- slide 35h -->
-    <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
     <!-- slide 35j -->
     <string name="EPr_beastMode_reset">Reset to defaults</string>
 
-    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-
     <!-- slide 34b: Preferences: Wrap task titles to two lines -->
     <string name="EPr_fullTask_title">Show full task title</string>
 

src/main/res/xml/preferences_appearance.xml

@@ -23,11 +23,9 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/EPr_edit_screen_options">
-        <Preference android:title="@string/customize_edit_screen">
-            <intent
-                android:targetClass="com.todoroo.astrid.activity.BeastModePreferences"
-                android:targetPackage="org.tasks" />
-        </Preference>
+        <Preference
+            android:key="@string/customize_edit_screen"
+            android:title="@string/customize_edit_screen"/>
 
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:defaultValue="true"