summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java5
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/Preferences.java8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 0213bd8..065ac71 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 7843110..cf90b17 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);
+ }
}
}
}