From 97fdbf109e0d4b10658c3626333fd1a737426ddd Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 23 Dec 2019 11:56:25 -0600 Subject: [PATCH] Hide subtasks option on pre-marshmallow devices --- .../main/java/org/tasks/preferences/BasicPreferences.java | 3 +++ app/src/main/res/xml/preferences.xml | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java index 4ea72f81b..f0f692891 100644 --- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java +++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java @@ -2,6 +2,7 @@ package org.tasks.preferences; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop; +import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow; import static java.util.Arrays.asList; import static org.tasks.PermissionUtil.verifyPermissions; import static org.tasks.dialogs.ExportTasksDialog.newExportTasksDialog; @@ -322,6 +323,8 @@ public class BasicPreferences extends InjectingPreferenceActivity R.string.p_language, R.string.p_layout_direction); + requires(R.string.task_list_options, atLeastMarshmallow(), R.string.p_show_subtasks); + requires(BuildConfig.DEBUG, R.string.debug); //noinspection ConstantConditions diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 7f9e1cbf3..f67706696 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -22,9 +22,11 @@ - + -