From 73c303e92d43cb74824f25b8158c65765b1a421b Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Sat, 22 Jun 2013 00:53:35 +0200 Subject: Trebuchet: Sync "maxExternal" preferences and its defaults values Change-Id: If6f70d75a9a2e5ea044e68dcaf906748bd09a53e Signed-off-by: Jorge Ruesga --- src/com/cyanogenmod/trebuchet/Hotseat.java | 4 +++- src/com/cyanogenmod/trebuchet/Workspace.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/cyanogenmod/trebuchet/Hotseat.java b/src/com/cyanogenmod/trebuchet/Hotseat.java index 2773c0f73..5dcbcb1fb 100644 --- a/src/com/cyanogenmod/trebuchet/Hotseat.java +++ b/src/com/cyanogenmod/trebuchet/Hotseat.java @@ -38,6 +38,8 @@ public class Hotseat extends PagedView { private float[] mTempCellLayoutCenterCoordinates = new float[2]; private Matrix mTempInverseMatrix = new Matrix(); + private static final int DEFAULT_PAGE = 0; + private static final int DEFAULT_CELL_COUNT = 5; public Hotseat(Context context) { @@ -57,7 +59,7 @@ public class Hotseat extends PagedView { mHandleScrollIndicator = true; int hotseatPages = PreferencesProvider.Interface.Dock.getNumberPages(); - int defaultPage = PreferencesProvider.Interface.Dock.getDefaultPage(hotseatPages / 2); + int defaultPage = PreferencesProvider.Interface.Dock.getDefaultPage(DEFAULT_PAGE); if (defaultPage >= hotseatPages) { defaultPage = hotseatPages / 2; } diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index cb96f36b5..a6f9154da 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -165,6 +165,8 @@ public class Workspace extends PagedView private SpringLoadedDragController mSpringLoadedDragController; private float mSpringLoadedShrinkFactor; + private static final int DEFAULT_HOMESCREEN = 2; + private static final int DEFAULT_CELL_COUNT_X = 4; private static final int DEFAULT_CELL_COUNT_Y = 4; @@ -385,7 +387,7 @@ public class Workspace extends PagedView // Preferences mNumberHomescreens = PreferencesProvider.Interface.Homescreen.getNumberHomescreens(); - mDefaultHomescreen = PreferencesProvider.Interface.Homescreen.getDefaultHomescreen(mNumberHomescreens / 2); + mDefaultHomescreen = PreferencesProvider.Interface.Homescreen.getDefaultHomescreen(DEFAULT_HOMESCREEN); if (mDefaultHomescreen >= mNumberHomescreens) { mDefaultHomescreen = mNumberHomescreens / 2; } -- cgit v1.2.3