summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java4
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/Preferences.java16
2 files changed, 15 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 10ef99dcf..0213bd82a 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -392,6 +392,10 @@ public class Workspace extends PagedView
}
mStretchScreens = PreferencesProvider.Interface.Homescreen.getStretchScreens();
+ // Large screen has calculated dimensions always
+ if (LauncherApplication.isScreenLarge()) {
+ mStretchScreens = false;
+ }
mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar();
mShowHotseat = PreferencesProvider.Interface.Dock.getShowDock();
mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels();
diff --git a/src/com/cyanogenmod/trebuchet/preference/Preferences.java b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
index 9b3996083..77f553e37 100644
--- a/src/com/cyanogenmod/trebuchet/preference/Preferences.java
+++ b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
@@ -126,11 +126,17 @@ public class Preferences extends PreferenceActivity
addPreferencesFromResource(R.xml.preferences_homescreen);
PreferenceCategory general = (PreferenceCategory)findPreference("ui_homescreen_general");
- boolean workspaceTabletGrid = getResources().getBoolean(R.bool.config_workspaceTabletGrid);
- if (general != null && (LauncherApplication.isScreenLarge() && workspaceTabletGrid == false)) {
- Preference grid = findPreference("ui_homescreen_grid");
- if (grid != null) {
- general.removePreference(grid);
+ if (general != null && LauncherApplication.isScreenLarge()) {
+ boolean workspaceTabletGrid = getResources().getBoolean(R.bool.config_workspaceTabletGrid);
+ if (workspaceTabletGrid == false))
+ Preference grid = findPreference("ui_homescreen_grid");
+ if (grid != null) {
+ general.removePreference(grid);
+ }
+ }
+ Preference stretch = findPreference("ui_homescreen_stretch_screens");
+ if (stretch != null) {
+ general.removePreference(stretch);
}
}
}