archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove force phone layout setting

Browse Source
pull/189/head
Alex Baker 10 years ago
parent 6c3cb90e74
commit fd75d8e3fc
23 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File

9
astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
Unescape Escape View File

@ -62,8 +62,6 @@ import javax.inject.Inject;
*/
public class EditPreferences extends InjectingTodorooPreferenceActivity {
private static final int APPEARANCE_PREFERENCE = 0;
private static final int REQUEST_CODE_SYNC = 0;
private static final int REQUEST_CODE_FILES_DIR = 2;
@ -136,11 +134,6 @@ public class EditPreferences extends InjectingTodorooPreferenceActivity {
addPreferenceListeners();
PreferenceScreen appearance = (PreferenceScreen) screen.getPreference(APPEARANCE_PREFERENCE);
if (!AndroidUtilities.isTabletSized(this)) {
appearance.removePreference(screen.findPreference(getString(R.string.p_force_phone_layout)));
}
preference = screen.findPreference(getString(R.string.p_showNotes));
preference.setEnabled(preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0) == 0);
@ -335,8 +328,6 @@ public class EditPreferences extends InjectingTodorooPreferenceActivity {
R.string.CRA_calendar_reminders_pref_desc_disabled, R.string.CRA_calendar_reminders_pref_desc_enabled)) {
} else if (booleanPreference(preference, value, R.string.p_end_at_deadline,
R.string.EPr_cal_end_at_due_time, R.string.EPr_cal_start_at_due_time)) {
} else if (r.getString(R.string.p_force_phone_layout).equals(preference.getKey())) {
preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
} else if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) {
if (value != null && !(Boolean) value) {
preference.setSummary(R.string.EPr_voiceInputEnabled_desc_disabled);

2
astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
Unescape Escape View File

@ -50,8 +50,6 @@ public class AstridDefaultPreferenceSpec {
setPreference(prefs, editor, r, R.string.p_use_dark_theme, false);
setPreference(prefs, editor, r, R.string.p_force_phone_layout, false);
setPreference(prefs, editor, r, R.string.p_show_quickadd_controls, true);
setPreference(prefs, editor, r, R.string.p_show_task_edit_comments, true);

5
astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java
Unescape Escape View File

@ -10,11 +10,8 @@ import android.content.Context;
import android.content.SharedPreferences;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.api.AstridApiConstants;
import org.tasks.R;
public class AstridPreferences {
/* ======================================================================
@ -33,6 +30,6 @@ public class AstridPreferences {
* ====================================================================== */
public static boolean useTabletLayout(Context context) {
return AndroidUtilities.isTabletSized(context) && !Preferences.getBoolean(R.string.p_force_phone_layout, false);
return AndroidUtilities.isTabletSized(context);
}
}

1
astrid/src/main/res/values-de/strings.xml
Unescape Escape View File

@ -230,7 +230,6 @@
<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>
<string name="EPr_force_phone_layout">Telefon-Layout benutzen</string>
<string name="EPr_show_save_and_cancel">Zeige Speichern und Abbrechen</string>
<string name="EPr_manage_header">Alte Aufgaben verwalten</string>
<string name="EPr_manage_delete_completed">Erledigte Aufgaben löschen</string>

1
astrid/src/main/res/values-el/strings.xml
Unescape Escape View File

@ -180,7 +180,6 @@
<string name="EPr_taskRowPrefs_title">Εμφάνιση σειράς καθήκοντος</string>
<string name="EPr_cal_end_or_start_at_due_time">Χρόνος event ημερολογίου</string>
<string name="EPr_cal_start_at_due_time">Εκκίνηση event ημερολογίου στην ώρα λήξης τους</string>
<string name="EPr_force_phone_layout">Χρήση εμφάνισης τηλεφώνου</string>
<string name="EPr_show_save_and_cancel">Εμφάνιση αποθήκευσης και ακύρωσης</string>
<string name="EPr_manage_header">Διαχείρηση παλιών καθηκόντων</string>
<string name="EPr_manage_delete_completed">Διαγραφή ολοκληρωμένων καθηκόντων</string>

1
astrid/src/main/res/values-es/strings.xml
Unescape Escape View File

@ -237,7 +237,6 @@
<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>
<string name="EPr_force_phone_layout">Usar diseño de teléfono</string>
<string name="EPr_show_save_and_cancel">Mostrar guardar y cancelar</string>
<string name="EPr_manage_header">Administrar tareas antiguas</string>
<string name="EPr_manage_delete_completed">Borrar tareas completadas</string>

1
astrid/src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -232,7 +232,6 @@
<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>
<string name="EPr_force_phone_layout">Utiliser la mise en page du téléphone</string>
<string name="EPr_show_save_and_cancel">Afficher enregistrer et annuler</string>
<string name="EPr_manage_header">Gérer les anciennes tâches</string>
<string name="EPr_manage_delete_completed">Supprimer les tâches terminées</string>

1
astrid/src/main/res/values-it/strings.xml
Unescape Escape View File

@ -199,7 +199,6 @@
<item>Single line title only</item>
</string-array>
<string name="EPr_taskRowPrefs_title">Aspetto della riga dei task</string>
<string name="EPr_force_phone_layout">Usa il layout del telefono</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>

1
astrid/src/main/res/values-iw/strings.xml
Unescape Escape View File

@ -233,7 +233,6 @@
<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>
<string name="EPr_force_phone_layout">מקלדת טלפון</string>
<string name="EPr_show_save_and_cancel">הראה את שמור וביטול</string>
<string name="EPr_manage_header">נהל משימות ישנות</string>
<string name="EPr_manage_delete_completed">מַחֲקִי משימות שבוצעו</string>

1
astrid/src/main/res/values-ko/strings.xml
Unescape Escape View File

@ -239,7 +239,6 @@
<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>
<string name="EPr_force_phone_layout">스마트폰의 레이아웃 사용하기</string>
<string name="EPr_show_save_and_cancel">저장과 취소 보이기</string>
<string name="EPr_manage_header">오래된 일정 관리하기</string>
<string name="EPr_manage_delete_completed">완료한 일정 지우기</string>

1
astrid/src/main/res/values-nl/strings.xml
Unescape Escape View File

@ -235,7 +235,6 @@
<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>
<string name="EPr_force_phone_layout">Gebruik telefoon layout</string>
<string name="EPr_show_save_and_cancel">Toon opslaan en annuleren</string>
<string name="EPr_manage_header">Oude taken beheren</string>
<string name="EPr_manage_delete_completed">Voltooide taken verwijderen</string>

1
astrid/src/main/res/values-pl/strings.xml
Unescape Escape View File

@ -225,7 +225,6 @@
<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>
<string name="EPr_force_phone_layout">Używaj wyglądu komórkowego</string>
<string name="EPr_show_save_and_cancel">Pokaż przyciski zapisz i anuluj</string>
<string name="EPr_manage_header">Zarządzaj starymi zadaniami</string>
<string name="EPr_manage_delete_completed">Usuń zakończone zadania</string>

1
astrid/src/main/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -213,7 +213,6 @@
<item>Single line title only</item>
</string-array>
<string name="EPr_taskRowPrefs_title">Aparência da Tarefa</string>
<string name="EPr_force_phone_layout">Usar layout do telefone</string>
<string name="EPr_manage_header">Gerenciar tarefas antigas</string>
<string name="EPr_manage_delete_completed">Exclui as tarefas concluídas</string>
<string name="EPr_manage_delete_completed_message">Você realmente deseja excluir todas as tarefas concluídas?</string>

1
astrid/src/main/res/values-ru/strings.xml
Unescape Escape View File

@ -236,7 +236,6 @@
<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>
<string name="EPr_force_phone_layout">Использовать режим телефона</string>
<string name="EPr_show_save_and_cancel">Показать сохранить и отменить</string>
<string name="EPr_manage_header">Управление старыми задачами</string>
<string name="EPr_manage_delete_completed">Удалить завершенные задачи</string>

1
astrid/src/main/res/values-sl-rSI/strings.xml
Unescape Escape View File

@ -239,7 +239,6 @@
<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>
<string name="EPr_force_phone_layout">Uporabi postavitev telefona</string>
<string name="EPr_show_save_and_cancel">Prikaži \"shrani\" in \"razveljavi\"</string>
<string name="EPr_manage_header">Upravljanje s preteklimi opravki</string>
<string name="EPr_manage_delete_completed">Zbriši dokončane opravke</string>

1
astrid/src/main/res/values-sv/strings.xml
Unescape Escape View File

@ -226,7 +226,6 @@
<string name="EPr_list_view">Listvy</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_force_phone_layout">Använd telefonutseende</string>
<string name="EPr_show_save_and_cancel">Visa spara och avbryt</string>
<string name="EPr_manage_header">Hantera gamla uppgifter</string>
<string name="EPr_manage_delete_completed">Radera färdiga uppgifter</string>

1
astrid/src/main/res/values-tr/strings.xml
Unescape Escape View File

@ -190,7 +190,6 @@
<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_force_phone_layout">Telefon yerleşimini kullan</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>

1
astrid/src/main/res/values-uk/strings.xml
Unescape Escape View File

@ -234,7 +234,6 @@
<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>
<string name="EPr_force_phone_layout">Використовувати режим телефона</string>
<string name="EPr_show_save_and_cancel">Показати зберегти і скасувати</string>
<string name="EPr_manage_header">Управління старими завданнями</string>
<string name="EPr_manage_delete_completed">Видалити виконані завдання</string>

1
astrid/src/main/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -181,7 +181,6 @@
<item>Single line title only</item>
</string-array>
<string name="EPr_taskRowPrefs_title">任务栏</string>
<string name="EPr_force_phone_layout">使用手机布局</string>
<string name="EPr_manage_header">管理旧任务</string>
<string name="EPr_manage_delete_completed">删除已完成任务</string>
<string name="EPr_manage_delete_completed_message">您真的要删除所有已完成任务吗？</string>

1
astrid/src/main/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -217,7 +217,6 @@
<item>Single line title only</item>
</string-array>
<string name="EPr_taskRowPrefs_title">任務工作欄</string>
<string name="EPr_force_phone_layout">使用手機佈局</string>
<string name="EPr_manage_header">管理舊任務工作</string>
<string name="EPr_manage_delete_completed">刪除已完成任務工作</string>
<string name="EPr_manage_delete_completed_message">您真的要刪除所有已完成任務工作嗎？</string>

3
astrid/src/main/res/values/keys.xml
Unescape Escape View File

@ -60,9 +60,6 @@
<!-- calendar reminders preference -->
<string name="p_calendar_reminders">p_calendar_reminder</string>
<!-- force tablets to use phone layout -->
<string name="p_force_phone_layout">force_phone_layout</string>
<!-- list view section key -->
<string name="p_list_view">p_list_view</string>

2
astrid/src/main/res/values/strings-core.xml
Unescape Escape View File

@ -524,8 +524,6 @@
<string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
<string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
<string name="EPr_force_phone_layout">Use phone layout</string>
<!-- Preference title for showing save and cancel buttons in task edit page -->
<string name="EPr_show_save_and_cancel">Show save and cancel </string>

7
astrid/src/main/res/xml/preferences.xml
Unescape Escape View File

@ -122,12 +122,7 @@
android:key="@string/p_showSmartConfirmation_key"
android:title="@string/EPr_showSmartConfirmation_title"
android:defaultValue="true"/>
<CheckBoxPreference
android:title="@string/EPr_force_phone_layout"
android:key="@string/p_force_phone_layout"
android:defaultValue="false"/>
</PreferenceScreen>
</PreferenceScreen>

Write Preview
Loading…
Cancel
Save