diff options
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/Workspace.java')
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index efd2199a0..f92d5c9fd 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -385,37 +385,36 @@ public class Workspace extends SmoothPagedView // if there is a value set it the preferences, use that instead if (!LauncherApplication.isScreenLarge()) { - cellCountX = PreferencesProvider.Interface.Homescreen.getCellCountX(context, cellCountX); - cellCountY = PreferencesProvider.Interface.Homescreen.getCellCountY(context, cellCountY); + cellCountX = PreferencesProvider.Interface.Homescreen.getCellCountX(cellCountX); + cellCountY = PreferencesProvider.Interface.Homescreen.getCellCountY(cellCountY); } LauncherModel.updateWorkspaceLayoutCells(cellCountX, cellCountY); setHapticFeedbackEnabled(false); // Preferences - mNumberHomescreens = PreferencesProvider.Interface.Homescreen.getNumberHomescreens(context); - mDefaultHomescreen = PreferencesProvider.Interface.Homescreen.getDefaultHomescreen(context, - mNumberHomescreens / 2); + mNumberHomescreens = PreferencesProvider.Interface.Homescreen.getNumberHomescreens(); + mDefaultHomescreen = PreferencesProvider.Interface.Homescreen.getDefaultHomescreen(mNumberHomescreens / 2); if (mDefaultHomescreen >= mNumberHomescreens) { mDefaultHomescreen = mNumberHomescreens / 2; } - mStretchScreens = PreferencesProvider.Interface.Homescreen.getStretchScreens(context); - mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(context); - mResizeAnyWidget = PreferencesProvider.Interface.Homescreen.getResizeAnyWidget(context); - mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels(context); - mTransitionEffect = PreferencesProvider.Interface.Homescreen.Scrolling.getTransitionEffect(context, + mStretchScreens = PreferencesProvider.Interface.Homescreen.getStretchScreens(); + mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(); + mResizeAnyWidget = PreferencesProvider.Interface.Homescreen.getResizeAnyWidget(); + mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels(); + mTransitionEffect = PreferencesProvider.Interface.Homescreen.Scrolling.getTransitionEffect( res.getString(R.string.config_workspaceDefaultTransitionEffect)); - mScrollWallpaper = PreferencesProvider.Interface.Homescreen.Scrolling.getScrollWallpaper(context); - mWallpaperHack = PreferencesProvider.Interface.Homescreen.Scrolling.getWallpaperHack(context); - mShowOutlines = PreferencesProvider.Interface.Homescreen.Scrolling.getShowOutlines(context, + mScrollWallpaper = PreferencesProvider.Interface.Homescreen.Scrolling.getScrollWallpaper(); + mWallpaperHack = PreferencesProvider.Interface.Homescreen.Scrolling.getWallpaperHack(); + mShowOutlines = PreferencesProvider.Interface.Homescreen.Scrolling.getShowOutlines( res.getBoolean(R.bool.config_workspaceDefaultShowOutlines)); - mFadeInAdjacentScreens = PreferencesProvider.Interface.Homescreen.Scrolling.getFadeInAdjacentScreens(context, + mFadeInAdjacentScreens = PreferencesProvider.Interface.Homescreen.Scrolling.getFadeInAdjacentScreens( res.getBoolean(R.bool.config_workspaceDefualtFadeInAdjacentScreens)); - mShowScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getShowScrollingIndicator(context); - mFadeScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getFadeScrollingIndicator(context); - mScrollingIndicatorPosition = PreferencesProvider.Interface.Homescreen.Indicator.getScrollingIndicatorPosition(context); - mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(context); + mShowScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getShowScrollingIndicator(); + mFadeScrollingIndicator = PreferencesProvider.Interface.Homescreen.Indicator.getFadeScrollingIndicator(); + mScrollingIndicatorPosition = PreferencesProvider.Interface.Homescreen.Indicator.getScrollingIndicatorPosition(); + mShowDockDivider = PreferencesProvider.Interface.Dock.getShowDivider(); initWorkspace(); checkWallpaper(); |