diff options
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 12 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 12 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java | 14 |
4 files changed, 40 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 9e8b7abea..ce1aca974 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -312,6 +312,10 @@ s --> <string name="preferences_interface_homescreen_general_grid_summary">Choose the number of rows/columns on the homescreen</string> <string name="preferences_interface_homescreen_general_grid_rows_title">Rows</string> <string name="preferences_interface_homescreen_general_grid_columns_title">Columns</string> + <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Vertical Padding</string> + <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Extra vertical spacing on the homescreen</string> + <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Horizontal Padding</string> + <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Extra horizontal spacing on the homescreen</string> <string name="preferences_interface_homescreen_general_search_summary">Enable persistent search bar</string> <string name="preferences_interface_homescreen_general_resize_any_widget_title">Resize any widget</string> <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Allow resizing of widgets that normally aren\'t resizeable</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 96b43fb9b..999039070 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -46,6 +46,18 @@ launcher:maxExternal="ui_homescreen_screens" launcher:max="7" launcher:min="1" /> + <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screen_padding_vertical" + android:title="@string/preferences_interface_homescreen_general_screen_padding_vertical_title" + android:summary="@string/preferences_interface_homescreen_general_screen_padding_vertical_summary" + android:defaultValue="0" + launcher:max="10" + launcher:min="0" /> + <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screen_padding_horizontal" + android:title="@string/preferences_interface_homescreen_general_screen_padding_horizontal_title" + android:summary="@string/preferences_interface_homescreen_general_screen_padding_horizontal_summary" + android:defaultValue="0" + launcher:max="10" + launcher:min="0" /> <CheckBoxPreference android:key="ui_homescreen_general_search" android:title="@string/preferences_interface_homescreen_general_search_title" android:summary="@string/preferences_interface_homescreen_general_search_summary" diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index 2ae8f32e0..5fc3b7a57 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -261,6 +261,8 @@ public class Workspace extends SmoothPagedView // Preferences private int mNumberHomescreens; private int mDefaultHomescreen; + private int mScreenPaddingVertical; + private int mScreenPaddingHorizontal; private boolean mShowSearchBar; private boolean mResizeAnyWidget; private boolean mHideIconLabels; @@ -340,6 +342,8 @@ public class Workspace extends SmoothPagedView if (mDefaultHomescreen >= mNumberHomescreens) { mDefaultHomescreen = mNumberHomescreens / 2; } + mScreenPaddingVertical = PreferencesProvider.Interface.Homescreen.getScreenPaddingVertical(context); + mScreenPaddingHorizontal = PreferencesProvider.Interface.Homescreen.getScreenPaddingHorizontal(context); mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(context); mResizeAnyWidget = PreferencesProvider.Interface.Homescreen.getResizeAnyWidget(context); mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels(context); @@ -464,8 +468,12 @@ public class Workspace extends SmoothPagedView LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); for (int i = 0; i < mNumberHomescreens; i++) { - inflater.inflate(R.layout.workspace_screen, this); - } + 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); } 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 efdb74c38..e12bf0034 100644 --- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java +++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java @@ -19,6 +19,10 @@ package com.cyanogenmod.trebuchet.preference; import android.content.Context; import android.content.SharedPreferences; +import com.cyanogenmod.trebuchet.LauncherApplication; +import com.cyanogenmod.trebuchet.Workspace; +import com.cyanogenmod.trebuchet.AppsCustomizePagedView; + public final class PreferencesProvider { public static final String PREFERENCES_KEY = "com.cyanogenmod.trebuchet_preferences"; @@ -51,6 +55,16 @@ public final class PreferencesProvider { return def; } } + public static int getScreenPaddingVertical(Context context) { + final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); + return (int)((float) preferences.getInt("ui_homescreen_screen_padding_vertical", 0) * 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", 0) * 3.0f * + LauncherApplication.getScreenDensity()); + } public static boolean getShowSearchBar(Context context) { final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); return preferences.getBoolean("ui_homescreen_general_search", true); |