summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-da/cm_strings.xml6
-rw-r--r--res/values-el/cm_strings.xml1
-rw-r--r--res/values-es/cm_strings.xml1
-rw-r--r--res/values-nl/cm_strings.xml1
-rw-r--r--res/values-ru/cm_strings.xml4
-rw-r--r--res/values-sk/cm_strings.xml67
-rw-r--r--res/values/cm_strings.xml4
-rw-r--r--res/xml/preferences_homescreen.xml4
-rw-r--r--src/com/cyanogenmod/trebuchet/CellLayout.java27
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java11
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java3
11 files changed, 75 insertions, 54 deletions
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 4bf8a8a9c..f0ee5aa05 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -119,6 +119,11 @@
<string name="preferences_interface_general_fullscreen_title">Fuldskærmstilstand</string>
<string name="preferences_interface_general_fullscreen_summary">Skjul statuslinjen for at udvide startskærmen</string>
<string name="folder_empty_contents_title">Ingen objekter fundet</string>
+ <string name="preferences_interface_general_iconpack_title">Ikon-pakke</string>
+ <string name="preferences_interface_general_iconpack_summary">Ikon-pakker erstatter standardikoner for applikationer</string>
+ <string name="dialog_pick_iconpack_title">Vælg ikon-pakke</string>
+ <string name="default_iconpack_title">Standard</string>
+ <string name="no_iconpacks_summary">Ingen ikon-pakker installeret</string>
<string name="effects_standard">Standard</string>
<string name="effects_tablet">Tablet</string>
<string name="effects_zoom_in">Zoom ind</string>
@@ -139,4 +144,5 @@
<string name="live_folder_cling_create_folder">Live-mapper lader app-udviklere oprette mapper med dynamisk indhold.
Mappeindhold kan fjernes med et langt tryk på et enkelt objekt. I modsætning til normale mapper kan objekter kun tilføjes af
app\'en, som har oprettet mappen</string>
+ <string name="conversations_title">Samtaler</string>
</resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 5f17cfcae..bc6ce10d9 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -145,4 +145,5 @@
<string name="live_folder_cling_create_folder">Οι ζωντανοί φάκελοι επιτρέπουν στους προγραμματιστές εφαρμογών να δημιουργούν φακέλους με
δυναμικό περιεχόμενο. Τα περιεχόμενα του φακέλου μπορούν να αφαιρεθούν με παρατεταμένο πάτημα σε καθένα από τα στοιχεία. Σε αντίθεση με
τους κανονικούς φακέλους, στοιχεία μπορούν να προστεθούν μόνο από την εφαργμογή που δημιουργεί τον φάκελο</string>
+ <string name="conversations_title">Συζητήσεις</string>
</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 0701fc2a9..a807166ac 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -143,4 +143,5 @@
<string name="effects_carousel_right">Carrusel derecha</string>
<string name="live_folder_cling_title">Carpetas dinámicas</string>
<string name="live_folder_cling_create_folder">Las carpetas dinámicas permiten a los desarrolladores de aplicaciones, crear carpetas con contenido dinámico. El contenido de las carpetas puede ser eliminado con una pulsación larga sobre un elemento, pero a diferencia de las carpetas normales, los nuevos elementos solo pueden ser añadidos por la aplicación que creó la carpeta</string>
+ <string name="conversations_title">Conversaciones</string>
</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 9c980e65a..4fd3a4ca4 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -143,4 +143,5 @@
<string name="effects_carousel_right">Carrousel rechts</string>
<string name="live_folder_cling_title">Dynamische mappen</string>
<string name="live_folder_cling_create_folder">Met dynamische mappen kunnen app-ontwikkelaars mappen aanmaken met dynamische inhoud. De inhoud hiervan kan verwijderd worden door een item lang aan te raken. In tegenstelling tot normale mappen kunnen items alleen worden toegevoegd door de app die de map heeft aangemaakt</string>
+ <string name="conversations_title">Gesprekken</string>
</resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 7f9824543..26532822b 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -164,6 +164,8 @@
<!-- Live folder cling -->
<string name="live_folder_cling_title">Живые папки</string>
- <!-- The description of how to create a folder [CHAR_LIMIT=none] -->
<string name="live_folder_cling_create_folder">Живые папки позволяют разработчикам приложений создавать папки с динамическим контентом. Содержимое папки можно удалить долгим нажатием на элемент. В отличие от обычных папок, в живую папку элементы могут добавляться только приложением, создавшим её.</string>
+
+ <!-- Folder titles -->
+ <string name="conversations_title">Диалоги</string>
</resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 4c47392c7..c1bec4d8a 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -25,7 +25,7 @@
<string name="menu_apps_sort_install_date">Dátum inštalácie</string>
<string name="menu_apps_filter_system">Systémové</string>
<string name="menu_apps_filter_downloaded">Prevzaté</string>
- <string name="menu_hidden_apps_delete">Znovunastaviť</string>
+ <string name="menu_hidden_apps_delete">Nastaviť znova</string>
<string name="all_apps_sort_cling_title">Usporiadanie vašich aplikácií</string>
<string name="all_apps_sort_cling_add_item">Kliknite a podržte záložku Aplikácie na vybratie režimu usporiadania</string>
<string name="hidden_apps_title">Skryté aplikácie</string>
@@ -41,41 +41,41 @@
<string name="preferences_interface_homescreen_general_default_screen_title">Predvolená obrazovka</string>
<string name="preferences_interface_homescreen_general_default_screen_summary">Výber predvolenej domovskej obrazovky</string>
<string name="preferences_interface_homescreen_general_search_title">Vyhľadávacia lišta</string>
- <string name="preferences_interface_homescreen_general_search_summary">Na trvalo povolí vyhľadávaciu lištu</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Natrvalo povoliť vyhľadávaciu lištu</string>
<string name="preferences_interface_homescreen_general_grid_title">Veľkosť mriežky</string>
- <string name="preferences_interface_homescreen_general_grid_summary">Zvolí počet riadkov/stĺpcov na domovskej obrazovke</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Zvoliť počet riadkov/stĺpcov na domovskej obrazovke</string>
<string name="preferences_interface_homescreen_general_grid_rows_title">Riadky</string>
<string name="preferences_interface_homescreen_general_grid_columns_title">Stĺpce</string>
<string name="preferences_interface_homescreen_general_stretch_screens_title">Roztiahnuť obrazovky</string>
- <string name="preferences_interface_homescreen_general_stretch_screens_summary">Zväčší domovské obrazovky, aby vyplnili celú veľkosť displeja</string>
- <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skryť menovky ikôn</string>
- <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skryje menovky ikôn na domovskej obrazovke</string>
+ <string name="preferences_interface_homescreen_general_stretch_screens_summary">Zväčšiť domovské obrazovky, aby vyplnili celú veľkosť displeja</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skryť menovky ikon</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skryť menovky ikon na domovskej obrazovke</string>
<string name="preferences_interface_homescreen_scrolling_category">Posúvanie</string>
<string name="preferences_interface_homescreen_scrolling_transition_effect_title">Efekt prechodu</string>
<string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Efekt posúvanie pri posúvaní domovských obrazoviek</string>
<string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Posúvať pozadie</string>
<string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Posunie pozadie pri posúvaní domovských obrazoviek</string>
<string name="preferences_interface_homescreen_scrolling_wallpaper_hack_title">Rýchle vykreslenie pozadia</string>
- <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_summary">Použije trik s pozadím, ktorý zvýši jemnosť nehybných obrázkov pozadia</string>
+ <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_summary">Použiť trik s pozadím, ktorý zvýši jemnosť nehybných obrázkov pozadia</string>
<string name="preferences_interface_homescreen_scrolling_wallpaper_size_title">Veľkosť pozadia</string>
- <string name="preferences_interface_homescreen_scrolling_wallpaper_size_summary">Určuje na koľko obrazoviek má byť široké pozadie</string>
+ <string name="preferences_interface_homescreen_scrolling_wallpaper_size_summary">Určiť, na koľko obrazoviek má byť široké pozadie</string>
<string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Zoslabenie bočných obrazoviek</string>
- <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Zoslabí bočné obrazovky pri posúvaní domovských obrazoviek</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Zoslabiť bočné obrazovky pri posúvaní domovských obrazoviek</string>
<string name="preferences_interface_homescreen_scrolling_show_outlines_title">Zobraziť okraje</string>
- <string name="preferences_interface_homescreen_scrolling_show_outlines_summary">Zobrazí okraje obrazoviek pri posúvaní domovských obrazoviek</string>
+ <string name="preferences_interface_homescreen_scrolling_show_outlines_summary">Zobraziť okraje obrazoviek pri posúvaní domovských obrazoviek</string>
<string name="preferences_interface_homescreen_indicator_category">Ukazovateľ</string>
<string name="preferences_interface_homescreen_indicator_enable_title">Zobraziť ukazovateľ stránok</string>
- <string name="preferences_interface_homescreen_indicator_enable_summary">Zobrazí ukazovateľ aktuálnej stránky na obrazovke</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Zobraziť ukazovateľ aktuálnej stránky na obrazovke</string>
<string name="preferences_interface_homescreen_indicator_fade_title">Zoslabiť ukazovateľ</string>
- <string name="preferences_interface_homescreen_indicator_fade_summary">Zoslabí ukazovateľ po zmene domovskej obrazovky</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Zoslabiť ukazovateľ po zmene domovskej obrazovky</string>
<string name="preferences_interface_homescreen_indicator_position_title">Pozícia ukazovateľa</string>
- <string name="preferences_interface_homescreen_indicator_position_summary">Určí, kde na obrazovke bude zobrazený ukazovateľ</string>
+ <string name="preferences_interface_homescreen_indicator_position_summary">Určiť, kde na obrazovke bude zobrazený ukazovateľ</string>
<string name="preferences_interface_drawer_title">Ponuka</string>
<string name="preferences_interface_drawer_summary">Ponuka aplikácií a miniaplikácií</string>
<string name="preferences_interface_drawer_orientation_title">Orientácia</string>
- <string name="preferences_interface_drawer_orientation_summary">Určí, ktorým smerom sa bude ponuka posúvať</string>
+ <string name="preferences_interface_drawer_orientation_summary">Určiť, ktorým smerom sa bude ponuka posúvať</string>
<string name="preferences_interface_drawer_hidden_apps_title">Skryté aplikácie</string>
- <string name="preferences_interface_drawer_hidden_apps_summary">Skryje aplikácie v ponuke</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">Skryť aplikácie v ponuke</string>
<string name="preferences_interface_drawer_apps_category">Aplikácie</string>
<string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Skryté aplikácie (skratky)</string>
<string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Odstrániť skratky skrytých aplikácií z domovskej obrazovky</string>
@@ -83,41 +83,41 @@
<string name="preferences_interface_drawer_hidden_apps_widgets_summary">Odstrániť miniaplikácie skrytých aplikácií z domovskej obrazovky</string>
<string name="preferences_interface_drawer_widgets_category">Miniaplikácie</string>
<string name="preferences_interface_drawer_widgets_join_apps_title">Zlúčiť s aplikáciami</string>
- <string name="preferences_interface_drawer_widgets_join_apps_summary">Posunie z ponuky aplikácií do ponuky miniaplikácií bez zmeny karty</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Posun z ponuky aplikácií do ponuky miniaplikácií bez zmeny karty</string>
<string name="preferences_interface_drawer_scrolling_category">Posúvanie</string>
<string name="preferences_interface_drawer_scrolling_transition_effect_title">Efekt prechodu</string>
<string name="preferences_interface_drawer_scrolling_transition_effect_summary">Efekt posúvanie pri posúvaní obrazoviek</string>
<string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Zoslabiť bočné stránky</string>
- <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Zoslabí bočné stránky pri posúvaní obrazoviek</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Zoslabiť bočné stránky pri posúvaní obrazoviek</string>
<string name="preferences_interface_drawer_indicator_category">Ukazovateľ</string>
<string name="preferences_interface_drawer_indicator_enable_title">Zobraziť ukazovateľ stránok</string>
- <string name="preferences_interface_drawer_indicator_enable_summary">Zobrazí ukazovateľ aktuálnej stránky na spodku obrazovky</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Zobraziť ukazovateľ aktuálnej stránky na spodku obrazovky</string>
<string name="preferences_interface_drawer_indicator_fade_title">Zoslabiť ukazovateľ</string>
- <string name="preferences_interface_drawer_indicator_fade_summary">Zoslabí ukazovateľ po zmene stránky</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Zoslabiť ukazovateľ po zmene stránky</string>
<string name="preferences_interface_drawer_indicator_position_title">Pozícia ukazovateľa</string>
- <string name="preferences_interface_drawer_indicator_position_summary">Určí, kde na obrazovke bude zobrazený ukazovateľ</string>
+ <string name="preferences_interface_drawer_indicator_position_summary">Určiť, kde na obrazovke bude zobrazený ukazovateľ</string>
<string name="preferences_interface_dock_title">Dok</string>
<string name="preferences_interface_dock_enabled_title">Zobraziť dok</string>
<string name="preferences_interface_dock_enabled_summary">Zobrazí dok pod domovskou obrazovkou</string>
<string name="preferences_interface_dock_pages_title">Stránky</string>
<string name="preferences_interface_dock_pages_summary">Počet stránok v doku</string>
<string name="preferences_interface_dock_default_page_title">Predvolená stránka</string>
- <string name="preferences_interface_dock_default_page_summary">Určí predvolenú stránku</string>
+ <string name="preferences_interface_dock_default_page_summary">Vybrať predvolenú stránku</string>
<string name="preferences_interface_dock_icons_title">Ikony</string>
- <string name="preferences_interface_dock_icons_summary">Počet ikôn/stĺpcov v doku</string>
- <string name="preferences_interface_dock_hide_icon_labels_title">Skryť menovky ikôn</string>
- <string name="preferences_interface_dock_hide_icon_labels_summary">Skryje menovky ikôn v doku</string>
- <string name="preferences_interface_dock_icon_scale_title">Mierka ikôn</string>
- <string name="preferences_interface_dock_icon_scale_summary">Mierka ikôn v doku</string>
+ <string name="preferences_interface_dock_icons_summary">Počet ikon/stĺpcov v doku</string>
+ <string name="preferences_interface_dock_hide_icon_labels_title">Skryť menovky ikon</string>
+ <string name="preferences_interface_dock_hide_icon_labels_summary">Skryť menovky ikon v doku</string>
+ <string name="preferences_interface_dock_icon_scale_title">Mierka ikon</string>
+ <string name="preferences_interface_dock_icon_scale_summary">Mierka ikon v doku</string>
<string name="preferences_interface_dock_divider_title">Zobraziť oddeľovač</string>
- <string name="preferences_interface_dock_divider_summary">Zobrazí oddeľovač medzi domovskou obrazovkou a dokom</string>
+ <string name="preferences_interface_dock_divider_summary">Zobraziť oddeľovač medzi domovskou obrazovkou a dokom</string>
<string name="preferences_interface_icons_title">Ikony</string>
<string name="preferences_interface_general_title">Všeobecné</string>
<string name="preferences_interface_general_orientation_title">Automaticky otáčať obrazovku</string>
<string name="preferences_interface_general_lock_workspace_title">Uzamknúť domovskú obrazovku</string>
- <string name="preferences_interface_general_lock_workspace_summary">Uzamkne pozície odkazov a priečinkov domovskej obrazovky, doku a ponuky aplikácií a miniaplikácií</string>
+ <string name="preferences_interface_general_lock_workspace_summary">Uzamknúť pozície odkazov a priečinkov domovskej obrazovky, doku a ponuky aplikácií a miniaplikácií</string>
<string name="preferences_interface_general_fullscreen_title">Režim na celú obrazovku</string>
- <string name="preferences_interface_general_fullscreen_summary">Skryje stavovú lištu kvôli zväčšeniu domovskej obrazovky</string>
+ <string name="preferences_interface_general_fullscreen_summary">Skryť stavovú lištu kvôli zväčšeniu domovskej obrazovky</string>
<string name="folder_empty_contents_title">Nenájdené žiadne položky</string>
<string name="effects_standard">Štandardný</string>
<string name="effects_tablet">Tablet</string>
@@ -139,9 +139,10 @@
<string name="live_folder_cling_create_folder">Živé priečinky umožňujú vývojárom aplikácií vytvárať priečinky s dynamickým obsahom.
Obsah priečinka možno odstrániť dlhým stlačením na položku. Na rozdiel od bežných priečinkov, položky môžu byť pridané len
aplikáciou, ktorý vytvorila priečinok</string>
- <string name="preferences_interface_general_iconpack_title">Balík ikôn</string>
- <string name="preferences_interface_general_iconpack_summary">Balíky ikôn nahradzujú predvolené ikony aplikácií</string>
- <string name="dialog_pick_iconpack_title">Vyberte balík ikôn</string>
+ <string name="preferences_interface_general_iconpack_title">Balík ikon</string>
+ <string name="preferences_interface_general_iconpack_summary">Balíky ikon nahradzujú predvolené ikony aplikácií</string>
+ <string name="dialog_pick_iconpack_title">Vyberte balík ikon</string>
<string name="default_iconpack_title">Predvolené ikony</string>
- <string name="no_iconpacks_summary">Nie sú nainštalované žiadne balíky ikôn</string>
+ <string name="no_iconpacks_summary">Nie sú nainštalované žiadne balíky ikon</string>
+ <string name="conversations_title">Konverzácie</string>
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 4fad35400..f0fba6da7 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -81,6 +81,8 @@
<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_stretch_screens_title">Stretch screens</string>
+ <string name="preferences_interface_homescreen_general_stretch_screens_summary">Expand homescreens to fill the size of display</string>
<string name="preferences_interface_homescreen_general_hide_icon_labels_title">Hide icon labels</string>
<string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Hide homescreen icon labels</string>
<string name="preferences_interface_homescreen_scrolling_category">Scrolling</string>
@@ -193,5 +195,5 @@
<!-- Folder titles -->
<string name="conversations_title">Conversations</string>
- <string name="google_title">Google</string>
+ <string name="google_title" translatable="false">Google</string>
</resources>
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
index 18342253b..ec4ef8d91 100644
--- a/res/xml/preferences_homescreen.xml
+++ b/res/xml/preferences_homescreen.xml
@@ -45,6 +45,10 @@
launcher:maxExternal="ui_homescreen_screens"
launcher:max="5"
launcher:min="1" />
+ <CheckBoxPreference android:key="ui_homescreen_stretch_screens"
+ android:title="@string/preferences_interface_homescreen_general_stretch_screens_title"
+ android:summary="@string/preferences_interface_homescreen_general_stretch_screens_summary"
+ android:defaultValue="true" />
<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/CellLayout.java b/src/com/cyanogenmod/trebuchet/CellLayout.java
index 2118a95f0..eab7d1e02 100644
--- a/src/com/cyanogenmod/trebuchet/CellLayout.java
+++ b/src/com/cyanogenmod/trebuchet/CellLayout.java
@@ -74,6 +74,7 @@ public class CellLayout extends ViewGroup {
private int mOriginalHeightGap;
private int mWidthGap;
private int mHeightGap;
+ private int mMaxGap;
private boolean mScrollingTransformsDirty = false;
private final Rect mRect = new Rect();
@@ -190,6 +191,7 @@ public class CellLayout extends ViewGroup {
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);
mCountX = LauncherModel.getWorkspaceCellCountX();
mCountY = LauncherModel.getWorkspaceCellCountY();
mOccupied = new boolean[mCountX][mCountY];
@@ -281,6 +283,11 @@ public class CellLayout extends ViewGroup {
mShortcutsAndWidgets = new ShortcutAndWidgetContainer(context);
+ if (!LauncherApplication.isScreenLarge()){
+ mCellWidth = (mCellWidth * res.getInteger(R.integer.default_cell_count_x)) / mCountX;
+ mCellHeight = (mCellHeight * res.getInteger(R.integer.default_cell_count_y)) / mCountY;
+ }
+
mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mWidthGap, mHeightGap);
addView(mShortcutsAndWidgets);
}
@@ -992,26 +999,10 @@ public class CellLayout extends ViewGroup {
if (mOriginalWidthGap < 0 || mOriginalHeightGap < 0) {
int hSpace = widthSpecSize - getPaddingLeft() - getPaddingRight();
int vSpace = heightSpecSize - getPaddingTop() - getPaddingBottom();
-
- if (hSpace - (mCountX * mCellWidth) < 0) {
- mCellWidth = hSpace / mCountX;
- }
- if (vSpace - (mCountY * mCellHeight) < 0) {
- mCellHeight = vSpace / mCountY;
- }
-
int hFreeSpace = hSpace - (mCountX * mCellWidth);
int vFreeSpace = vSpace - (mCountY * mCellHeight);
-
- mWidthGap = 0;
- mHeightGap = 0;
-
- if (numWidthGaps > 0) {
- mWidthGap = hFreeSpace / numWidthGaps;
- }
- if (numHeightGaps > 0) {
- mHeightGap = vFreeSpace / numHeightGaps;
- }
+ mWidthGap = Math.min(mMaxGap, numWidthGaps > 0 ? (hFreeSpace / numWidthGaps) : 0);
+ mHeightGap = Math.min(mMaxGap,numHeightGaps > 0 ? (vFreeSpace / numHeightGaps) : 0);
mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mWidthGap, mHeightGap);
} else {
mWidthGap = mOriginalWidthGap;
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index ac07d6cf9..0321e2b3f 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -305,6 +305,7 @@ public class Workspace extends PagedView
// Preferences
private int mNumberHomescreens;
private int mDefaultHomescreen;
+ private boolean mStretchScreens;
private boolean mShowSearchBar;
private boolean mShowHotseat;
private boolean mHideIconLabels;
@@ -392,6 +393,12 @@ public class Workspace extends PagedView
mDefaultHomescreen = mNumberHomescreens / 2;
}
+ mStretchScreens = PreferencesProvider.Interface.Homescreen.getStretchScreens();
+ // Large screen has calculated dimensions always, unless specified by config_workspaceTabletGrid option
+ boolean workspaceTabletGrid = getResources().getBoolean(R.bool.config_workspaceTabletGrid);
+ if (LauncherApplication.isScreenLarge() && workspaceTabletGrid == false) {
+ mStretchScreens = false;
+ }
mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar();
mShowHotseat = PreferencesProvider.Interface.Dock.getShowDock();
mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels();
@@ -524,7 +531,9 @@ public class Workspace extends PagedView
(LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
for (int i = 0; i < mNumberHomescreens; i++) {
CellLayout screen = (CellLayout) inflater.inflate(R.layout.workspace_screen, null);
- screen.setCellGaps(-1, -1);
+ if (mStretchScreens) {
+ screen.setCellGaps(-1, -1);
+ }
addView(screen);
}
diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
index 0cf38ae63..cd88bb5fd 100644
--- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
+++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
@@ -93,6 +93,9 @@ public final class PreferencesProvider {
return def;
}
}
+ public static boolean getStretchScreens() {
+ return getBoolean("ui_homescreen_stretch_screens", true);
+ }
public static boolean getShowSearchBar() {
return getBoolean("ui_homescreen_general_search", true);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 15:08:38 +0000