Fix for low aspect ratio (4x3) tablets.

The recent changes (http://review.cyanogenmod.org/#/c/42991/) cause
problems for tablets with a 4x3 screen such as Tenderloin. The icon
spacing is not calculated correctly. This is stated in the code for
Workspace.java at line 441:
"//TODO: This code currently fails on tablets with an aspect ratio < 1.3."
This change fixes that failure for such tablets.
Besides setting the grid size, stretching is required to get useable
screens. This reenables stretching as well as grid size setting if
the maintainer has specified
    <bool name="config_workspaceTabletGrid">true</bool>
in an overlay. There is no change to the default behavior.

Change-Id: I71b51a5ffe9911f1bb2da0b33930f73950efc782

2 files changed, 7 insertions, 6 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 0213bd82a..065ac7140 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -392,8 +392,9 @@ public class Workspace extends PagedView
         }
 
         mStretchScreens = PreferencesProvider.Interface.Homescreen.getStretchScreens();
-        // Large screen has calculated dimensions always
-        if (LauncherApplication.isScreenLarge()) {
+        // Large screen has calculated dimensions always, unless specified by config_workspaceTabletGrid option
+        boolean workspaceTabletGrid = getResources().getBoolean(R.bool.config_workspaceTabletGrid);
+        if (LauncherApplication.isScreenLarge() && workspaceTabletGrid == false) {
             mStretchScreens = false;
         }
         mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar();
diff --git a/src/com/cyanogenmod/trebuchet/preference/Preferences.java b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
index 7843110b3..cf90b170a 100644
--- a/src/com/cyanogenmod/trebuchet/preference/Preferences.java
+++ b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
@@ -133,10 +133,10 @@ public class Preferences extends PreferenceActivity
                     if (grid != null) {
                         general.removePreference(grid);
                     }
-                }
-                Preference stretch = findPreference("ui_homescreen_stretch_screens");
-                if (stretch != null) {
-                    general.removePreference(stretch);
+                    Preference stretch = findPreference("ui_homescreen_stretch_screens");
+                    if (stretch != null) {
+                        general.removePreference(stretch);
+                    }
                 }
             }
         }