diff options
| -rw-r--r-- | res/layout/hotseat.xml | 1 | ||||
| -rw-r--r-- | res/values-sw720dp-land/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values-sw720dp-port/dimens.xml | 8 | ||||
| -rw-r--r-- | res/values-sw720dp/dimens.xml | 9 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 4 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/preference/Preferences.java | 16 |
6 files changed, 28 insertions, 14 deletions
diff --git a/res/layout/hotseat.xml b/res/layout/hotseat.xml index dfe0c50a5..1072df666 100644 --- a/res/layout/hotseat.xml +++ b/res/layout/hotseat.xml @@ -16,4 +16,5 @@ <com.cyanogenmod.trebuchet.Hotseat xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" + launcher:pageSpacing="@dimen/workspace_page_spacing" launcher:cellCount="@integer/hotseat_cell_count" /> diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml index 825245057..c4e161df0 100644 --- a/res/values-sw720dp-land/dimens.xml +++ b/res/values-sw720dp-land/dimens.xml @@ -33,6 +33,10 @@ <integer name="apps_customize_cling_focused_x">4</integer> <integer name="apps_customize_cling_focused_y">2</integer> +<!-- Hotseat --> + <dimen name="hotseat_cell_width">110dp</dimen> + <dimen name="hotseat_width_gap">-1dp</dimen> + <!-- Cling --> <!-- The offset for the text in the cling --> <dimen name="cling_text_block_offset_x">140dp</dimen> diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml index fbc0799d3..7ab256509 100644 --- a/res/values-sw720dp-port/dimens.xml +++ b/res/values-sw720dp-port/dimens.xml @@ -35,8 +35,8 @@ <dimen name="qsb_bar_height">102dp</dimen> <dimen name="qsb_bar_height_inset">102dp</dimen> - <dimen name="qsb_padding_left">72dp</dimen> - <dimen name="qsb_padding_right">72dp</dimen> + <dimen name="qsb_padding_left">16dp</dimen> + <dimen name="qsb_padding_right">16dp</dimen> <!-- We offset the proxy to overlap with the voice icon --> <dimen name="qsb_voice_proxy_padding_right">100dp</dimen> @@ -44,8 +44,8 @@ <integer name="apps_customize_cling_focused_y">2</integer> <!-- Divider width set to match the qsb width --> - <dimen name="workspace_divider_padding_left">72dp</dimen> - <dimen name="workspace_divider_padding_right">72dp</dimen> + <dimen name="workspace_divider_padding_left">@dimen/qsb_padding_left</dimen> + <dimen name="workspace_divider_padding_right">@dimen/qsb_padding_right</dimen> <!-- Hotseat --> <dimen name="hotseat_width_gap">14dp</dimen> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 6e1727dbb..326003a8c 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -28,7 +28,6 @@ <dimen name="button_bar_width_right_padding">12dp</dimen> <dimen name="button_bar_height_plus_padding">82dp</dimen> <dimen name="button_bar_height_plus_padding_with_text">@dimen/button_bar_height_plus_padding</dimen> - <dimen name="hotseat_width_gap">58dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">8dip</dimen> @@ -37,8 +36,8 @@ <!-- Workspace --> <dimen name="qsb_bar_height">60dp</dimen> <dimen name="qsb_bar_height_inset">60dp</dimen> - <dimen name="qsb_padding_left">177dp</dimen> - <dimen name="qsb_padding_right">177dp</dimen> + <dimen name="qsb_padding_left">60dp</dimen> + <dimen name="qsb_padding_right">60dp</dimen> <!-- We offset the proxy to overlap with the voice icon --> <dimen name="qsb_voice_proxy_padding_right">230dp</dimen> <!-- 44dp high for the optical bounds --> @@ -96,8 +95,8 @@ <!-- Divider width set to match the qsb width --> <dimen name="workspace_divider_width">0dp</dimen> - <dimen name="workspace_divider_padding_left">177dp</dimen> - <dimen name="workspace_divider_padding_right">177dp</dimen> + <dimen name="workspace_divider_padding_left">@dimen/qsb_padding_left</dimen> + <dimen name="workspace_divider_padding_right">@dimen/qsb_padding_right</dimen> <dimen name="workspace_divider_padding_top">0dp</dimen> <dimen name="workspace_divider_padding_bottom">0dp</dimen> 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); } } } |