diff --git a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt index 933e47268b..c70bd568ab 100644 --- a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt +++ b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt @@ -47,8 +47,6 @@ class PreferenceManager private constructor(private val context: Context) : Base val folderRows = IdpIntPref("pref_folderRows", { numFolderRows }, reloadGrid) val allAppsColumns = IdpIntPref("pref_allAppsColumns", { numAllAppsColumns }, reloadGrid) - // TODO: Add the ability to manually delete empty pages. - val allowEmptyPages = BoolPref("pref_allowEmptyPages", false) val drawerOpacity = FloatPref("pref_drawerOpacity", 1F, reloadGrid) val coloredBackgroundLightness = FloatPref("pref_coloredBackgroundLightness", 0.9F, reloadIcons) val feedProvider = StringPref("pref_feedProvider", "") diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index d1e7fe34ff..9ab67ae04b 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -126,9 +126,6 @@ import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; -import app.lawnchair.preferences.BasePreferenceManager; -import app.lawnchair.preferences.PreferenceManager; - /** * The workspace is a wide area with a wallpaper and a finite number of pages. * Each page contains a number of icons, folders or widgets the user can @@ -268,9 +265,6 @@ public class Workspace extends PagedView private final StatsLogManager mStatsLogManager; - // Lawnchair: Create boolean to indicate if empty pages are allowed. - BasePreferenceManager.BoolPref emptyScreensAllowed; - /** * Used to inflate the Workspace from XML. * @@ -304,10 +298,6 @@ public class Workspace extends PagedView setMotionEventSplittingEnabled(true); setOnTouchListener(new WorkspaceTouchListener(mLauncher, this)); mStatsLogManager = StatsLogManager.newInstance(context); - - // Lawnchair: Get instance of `SharedPreferences`, assign value to `emptyScreensAllowed`. - PreferenceManager prefs = PreferenceManager.getInstance(getContext()); - emptyScreensAllowed = prefs.getAllowEmptyPages(); } @Override @@ -694,12 +684,6 @@ public class Workspace extends PagedView } if (hasExtraEmptyScreen() || mScreenOrder.size() == 0) return; - - // Lawnchair: Stop execution if empty pages are allowed. - if (emptyScreensAllowed.get()) { - return; - } - int finalScreenId = mScreenOrder.get(mScreenOrder.size() - 1); CellLayout finalScreen = mWorkspaceScreens.get(finalScreenId); @@ -820,12 +804,6 @@ public class Workspace extends PagedView // This is dangerous and can result in data loss. return; } - - // Lawnchair: Stop execution if empty pages are allowed. - if (emptyScreensAllowed.get()) { - return; - } - if (isPageInTransition()) { mStripScreensOnPageStopMoving = true; return;