diff options
author | nebkat <nebkat@teamhacksung.org> | 2012-12-16 16:23:58 +0000 |
---|---|---|
committer | nebkat <nebkat@teamhacksung.org> | 2012-12-16 16:23:58 +0000 |
commit | 177b57c73a876d9d18d2134221315b3e59ab11e9 (patch) | |
tree | f0535d55ec2c0f1353099cfcd6ceac8b90ace14c /src | |
parent | 9c4a28841f428007ac79b8b03192ff8938ed5784 (diff) | |
download | android_packages_apps_Trebuchet-177b57c73a876d9d18d2134221315b3e59ab11e9.tar.gz android_packages_apps_Trebuchet-177b57c73a876d9d18d2134221315b3e59ab11e9.tar.bz2 android_packages_apps_Trebuchet-177b57c73a876d9d18d2134221315b3e59ab11e9.zip |
Workspace: Stretch screens
Change-Id: I5b587ec8e90a45e5e1df6112299ab298c0f907be
Diffstat (limited to 'src')
-rw-r--r-- | src/com/cyanogenmod/trebuchet/CellLayout.java | 7 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 18 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java | 10 |
3 files changed, 16 insertions, 19 deletions
diff --git a/src/com/cyanogenmod/trebuchet/CellLayout.java b/src/com/cyanogenmod/trebuchet/CellLayout.java index 0b1225513..d61ffbaae 100644 --- a/src/com/cyanogenmod/trebuchet/CellLayout.java +++ b/src/com/cyanogenmod/trebuchet/CellLayout.java @@ -188,7 +188,7 @@ public class CellLayout extends ViewGroup { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CellLayout, defStyle, 0); mCellWidth = mOriginalCellWidth = a.getDimensionPixelSize(R.styleable.CellLayout_cellWidth, 10); - mCellHeight =mOriginalCellHeight = a.getDimensionPixelSize(R.styleable.CellLayout_cellHeight, 10); + mCellHeight = mOriginalCellHeight = a.getDimensionPixelSize(R.styleable.CellLayout_cellHeight, 10); mWidthGap = mOriginalWidthGap = a.getDimensionPixelSize(R.styleable.CellLayout_widthGap, 0); mHeightGap = mOriginalHeightGap = a.getDimensionPixelSize(R.styleable.CellLayout_heightGap, 0); mMaxGap = a.getDimensionPixelSize(R.styleable.CellLayout_maxGap, 0); @@ -901,6 +901,11 @@ public class CellLayout extends ViewGroup { return distance; } + void setCellGaps(int widthGap, int heightGap) { + mWidthGap = mOriginalWidthGap = widthGap; + mHeightGap = mOriginalHeightGap = heightGap; + } + int getCellWidth() { return mCellWidth; } diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index 8b2d97549..6a339df93 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -305,8 +305,7 @@ public class Workspace extends SmoothPagedView // Preferences private int mNumberHomescreens; private int mDefaultHomescreen; - private int mScreenPaddingVertical; - private int mScreenPaddingHorizontal; + private boolean mStretchScreens; private boolean mShowSearchBar; private boolean mResizeAnyWidget; private boolean mHideIconLabels; @@ -389,8 +388,7 @@ public class Workspace extends SmoothPagedView mDefaultHomescreen = mNumberHomescreens / 2; } - mScreenPaddingVertical = PreferencesProvider.Interface.Homescreen.getScreenPaddingVertical(context); - mScreenPaddingHorizontal = PreferencesProvider.Interface.Homescreen.getScreenPaddingHorizontal(context); + mStretchScreens = PreferencesProvider.Interface.Homescreen.getStretchScreens(context); mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(context); mResizeAnyWidget = PreferencesProvider.Interface.Homescreen.getResizeAnyWidget(context); mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels(context); @@ -512,12 +510,12 @@ public class Workspace extends SmoothPagedView LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); for (int i = 0; i < mNumberHomescreens; i++) { - View screen = inflater.inflate(R.layout.workspace_screen, null); - screen.setPadding(screen.getPaddingLeft() + mScreenPaddingHorizontal, - screen.getPaddingTop() + mScreenPaddingVertical, - screen.getPaddingRight() + mScreenPaddingHorizontal, - screen.getPaddingBottom() + mScreenPaddingVertical); - addView(screen); } + CellLayout screen = (CellLayout) inflater.inflate(R.layout.workspace_screen, null); + if (mStretchScreens) { + screen.setCellGaps(-1, -1); + } + addView(screen); + } try { mBackground = res.getDrawable(R.drawable.apps_customize_bg); diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java index 8cd84c1c3..e7f14aa6c 100644 --- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java +++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java @@ -55,15 +55,9 @@ public final class PreferencesProvider { return def; } } - public static int getScreenPaddingVertical(Context context) { + public static boolean getStretchScreens(Context context) { final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); - return (int)((float) preferences.getInt("ui_homescreen_screen_padding_vertical", 3) * 3.0f * - LauncherApplication.getScreenDensity()); - } - public static int getScreenPaddingHorizontal(Context context) { - final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); - return (int)((float) preferences.getInt("ui_homescreen_screen_padding_horizontal", 3) * 3.0f * - LauncherApplication.getScreenDensity()); + return preferences.getBoolean("ui_homescreen_stretch_screens", false); } public static boolean getShowSearchBar(Context context) { final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); |