diff options
| -rw-r--r-- | res/values-de/cm_strings.xml | 2 | ||||
| -rw-r--r-- | res/values-lt/cm_arrays.xml | 30 | ||||
| -rw-r--r-- | res/values-lt/cm_strings.xml | 187 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/LauncherProvider.java | 48 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/LauncherSettings.java | 6 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 2 |
7 files changed, 207 insertions, 71 deletions
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index ce1063dd3..cf50d55e5 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -142,4 +142,6 @@ <string name="effects_carousel_right">Karussell rechts</string> <string name="live_folder_cling_title">Live-Ordner</string> <string name="live_folder_cling_create_folder">Live-Ordner ermöglichen es App-Entwicklern, Ordner mit dynamischem Inhalt anzulegen. Ordnerinhalte können durch langes Drücken auf ein einzelnes Element entfernt werden. Anders als bei normalen Ordnern können Inhalte nur durch die App hinzugefügt werden, welche den Ordner angelegt hat.</string> + <string name="conversations_title">Unterhaltungen</string> + <string name="google_title">Google</string> </resources> diff --git a/res/values-lt/cm_arrays.xml b/res/values-lt/cm_arrays.xml new file mode 100644 index 000000000..4615a20b0 --- /dev/null +++ b/res/values-lt/cm_arrays.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012-2013 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="preferences_interface_homescreen_indicator_position_entries"> + <item>Virš skydelio</item> + <item>Viršuje</item> + <item>Apačioje</item> + </string-array> + <string-array name="preferences_interface_drawer_indicator_position_entries"> + <item>Viršus/Kairė</item> + <item>Apačia/Dešinė</item> + </string-array> + <string-array name="preferences_interface_drawer_orientation_entries"> + <item>Horizontaliai</item> + <item>Vertikaliai</item> + </string-array> +</resources> diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index 0baa886dc..36ca76042 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -13,86 +13,133 @@ See the License for the specific language governing permissions and limitations under the License. --> - <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="hidden_apps_title">Slepiamos</string> + <string name="application_copyright">Autorinės teisės \u00A9 2013 CyanogenMod projektas</string> + <string name="menu">Meniu</string> + <string name="cancel_target_label">Atšaukti</string> + <string name="edit_target_label">Keisti</string> + <string name="menu_lock_workspace">Užrakinti ekraną</string> + <string name="menu_unlock_workspace">Atrakinti ekraną</string> + <string name="menu_preferences">Trebuchet nustatymai</string> + <string name="menu_apps_sort_title">Pavadinimas</string> + <string name="menu_apps_sort_install_date">Įdiegimo data</string> + <string name="menu_apps_filter_system">Sistema</string> + <string name="menu_apps_filter_downloaded">Atsisiųsta</string> + <string name="menu_hidden_apps_delete">Atstatyti</string> + <string name="all_apps_sort_cling_title">Rikiuoti savo programas</string> + <string name="all_apps_sort_cling_add_item">Palieskite ir laikykite programų kortelę, kad pasirinkti rikiavimo būdą</string> + <string name="hidden_apps_title">Paslėptos programos</string> + <string name="workspace_locked">Pagrindinis ekranas yra užrakintas, atrakinkite nustatymuose, kad perrikiuoti</string> <string name="preferences_title">Nustatymai</string> - <string name="preferences_interface_title">Išvaizda</string> - <string name="preferences_application_title">Programėlės</string> - <string name="preferences_interface_homescreen_title">Darbalaukis</string> - <string name="preferences_interface_homescreen_summary">Langai ir tapetai</string> - <string name="preferences_interface_homescreen_general_category">Pagrindiniai</string> - <string name="preferences_interface_homescreen_general_screens_title">Darbalaukis</string> - <string name="preferences_interface_homescreen_general_screens_summary">Langų skaičius darbalaukyje</string> - <string name="preferences_interface_homescreen_general_default_screen_title">Pagrindinis langas</string> - <string name="preferences_interface_homescreen_general_default_screen_summary">Pasirinkite pagrindinį</string> + <string name="preferences_interface_title">Sąsaja</string> + <string name="preferences_application_title">Programa</string> + <string name="preferences_interface_homescreen_title">Pagrindinis ekranas</string> + <string name="preferences_interface_homescreen_summary">Ekranai ir tapetai</string> + <string name="preferences_interface_homescreen_general_category">Bendrai</string> + <string name="preferences_interface_homescreen_general_screens_title">Pagrindiniai ekranai</string> + <string name="preferences_interface_homescreen_general_screens_summary">Ekranų skaičius pagrindiniame ekrane</string> + <string name="preferences_interface_homescreen_general_default_screen_title">Numatytas ekranas</string> + <string name="preferences_interface_homescreen_general_default_screen_summary">Pasirinkti numatytąjį pagrindinį ekraną</string> <string name="preferences_interface_homescreen_general_search_title">Paieškos juosta</string> - <string name="preferences_interface_homescreen_general_search_summary">Įjungti paieškos juostą</string> + <string name="preferences_interface_homescreen_general_search_summary">Įjungti pastovią paieškos juostą</string> <string name="preferences_interface_homescreen_general_grid_title">Tinklelio dydis</string> - <string name="preferences_interface_homescreen_general_grid_summary">Pasirinkti eilučių/stulpelių skaičių</string> - <string name="preferences_interface_homescreen_general_grid_rows_title">Eiutės</string> + <string name="preferences_interface_homescreen_general_grid_summary">Pasirinkti eilučių ir stulpelių skaičių pagrindiniame ekrane</string> + <string name="preferences_interface_homescreen_general_grid_rows_title">Eilutės</string> <string name="preferences_interface_homescreen_general_grid_columns_title">Stulpeliai</string> - <string name="preferences_interface_homescreen_general_stretch_screens_title">Ištempti langus</string> - <string name="preferences_interface_homescreen_general_stretch_screens_summary">Ištempti langus per visą ekraną</string> - <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Slepti pavadinimus</string> - <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Slepti užrašus po piktogramomis darbalaukyje</string> - <string name="preferences_interface_homescreen_scrolling_category">Slinkimas</string> - <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Slinkimo efektas</string> - <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Langų slinkimo efektas</string> - <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Tapeto slinkimas</string> - <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Slinkti tapetą sukant langus</string> - <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_title">Tapeto greitas perpiešimas</string> - <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_summary">Naudoja tapeto atvaizdavimo modifikaciją</string> + <string name="preferences_interface_homescreen_general_stretch_screens_title">Ištempti ekranus</string> + <string name="preferences_interface_homescreen_general_stretch_screens_summary">Plėsti pagrindinius ekranus, kad užpildytų ekrano dydį</string> + <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Slėpti piktogramų pavadinimus</string> + <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Slėpti pagrindinio ekrano piktogramų pavadinimus</string> + <string name="preferences_interface_homescreen_scrolling_category">Slinkties juosta</string> + <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Perėjimo efektas</string> + <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Slinkimo efektas kai slenkami pagrindiniai ekranai</string> + <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Slinkti tapetą</string> + <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Slinkti tapetą kai slenkami pagrindiniai ekranai</string> + <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_title">Tapeto greitas atvaizdavimas</string> + <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_summary">Naudoti tapeto pagerinimą, kuris padidina statinių tapetų paveikslėlių tikslumą</string> <string name="preferences_interface_homescreen_scrolling_wallpaper_size_title">Tapeto dydis</string> - <string name="preferences_interface_homescreen_scrolling_wallpaper_size_summary">Kiek langų tapetas turi dengti</string> - <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Blukinti šoninius langus</string> - <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Blukinti šoninius langus slenkant</string> - <string name="preferences_interface_homescreen_scrolling_show_outlines_title">Rodyti kontūrą</string> - <string name="preferences_interface_homescreen_scrolling_show_outlines_summary">Rodyti langų kontūrus slenkant</string> + <string name="preferences_interface_homescreen_scrolling_wallpaper_size_summary">Kelių ekranų pločio tapetas turėtų būti</string> + <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Blukinti šoninius ekranus</string> + <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Išblukinimo efektas kai slenkami pagrindiniai ekranai</string> + <string name="preferences_interface_homescreen_scrolling_show_outlines_title">Rodyti struktūras</string> + <string name="preferences_interface_homescreen_scrolling_show_outlines_summary">Rodyti ekrano struktūrą kai slenkami pagrindiniai ekranai</string> <string name="preferences_interface_homescreen_indicator_category">Indikatorius</string> - <string name="preferences_interface_homescreen_indicator_enable_title">Rodo lango indikatorių</string> - <string name="preferences_interface_homescreen_indicator_enable_summary">Rodyti esamo lango indikatorių</string> - <string name="preferences_interface_homescreen_indicator_fade_title">Blukinti indikatorių</string> - <string name="preferences_interface_homescreen_indicator_fade_summary">Blukinti indikatorių perslinkus langą</string> - <string name="preferences_interface_homescreen_indicator_position_title">Indikatoriaus vieta</string> - <string name="preferences_interface_homescreen_indicator_position_summary">Pasirinkite kurioje vietoje rodyti indikatorių</string> - <string name="preferences_interface_drawer_title">Programėlių sąrašas</string> - <string name="preferences_interface_drawer_summary">Programėlės ir valdikliai</string> + <string name="preferences_interface_homescreen_indicator_enable_title">Rodyti puslapio indikatorių</string> + <string name="preferences_interface_homescreen_indicator_enable_summary">Rodyti dabartinio puslapio indikatorių ekrane</string> + <string name="preferences_interface_homescreen_indicator_fade_title">Pamažu išblukinti indikatorių</string> + <string name="preferences_interface_homescreen_indicator_fade_summary">Pamažu išblukinti indikatorių kai pagrindinis ekranas pakeičiamas</string> + <string name="preferences_interface_homescreen_indicator_position_title">Indikatoriaus pozicija</string> + <string name="preferences_interface_homescreen_indicator_position_summary">Pasirinkti ar rodyti indikatorių ekrane</string> + <string name="preferences_interface_drawer_title">Stalčius</string> + <string name="preferences_interface_drawer_summary">Programų ir valdiklių stalčius</string> <string name="preferences_interface_drawer_orientation_title">Orientacija</string> - <string name="preferences_interface_drawer_orientation_summary">Pasirinkite kaip slinkti programėlių sąrašą</string> - <string name="preferences_interface_drawer_hidden_apps_title">Slepiamos programėlės</string> - <string name="preferences_interface_drawer_hidden_apps_summary">Slėpti piktogramas programėlių sąraše</string> + <string name="preferences_interface_drawer_orientation_summary">Pasirinkti, kuria kryptimi stalčius slinks</string> + <string name="preferences_interface_drawer_apps_category">Programos</string> + <string name="preferences_interface_drawer_hidden_apps_title">Paslėptos programos</string> + <string name="preferences_interface_drawer_hidden_apps_summary">Slėpti programas stalčiuje</string> + <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Paslėptos programos (šaukiniai)</string> + <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Pašalinti paslėptų programų šaukinius iš pagrindinio ekrano</string> + <string name="preferences_interface_drawer_hidden_apps_widgets_title">Paslėptos programos (valdikliai)</string> + <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Pašalinti paslėptų programų valdiklius iš pagrindinio ekrano</string> <string name="preferences_interface_drawer_widgets_category">Valdikliai</string> - <string name="preferences_interface_drawer_widgets_join_apps_title">Jungti su programėlėmis</string> - <string name="preferences_interface_drawer_widgets_join_apps_summary">Slenkant pereina prie valdiklių</string> - <string name="preferences_interface_drawer_scrolling_category">Slinkimas</string> - <string name="preferences_interface_drawer_scrolling_transition_effect_title">Slinkimo efektas</string> - <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Slinkimo efekto pasirinkimas</string> - <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Blukinti šoninius</string> - <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Blukinti šoninius slenkant</string> + <string name="preferences_interface_drawer_widgets_join_apps_title">Sujungti su programomis</string> + <string name="preferences_interface_drawer_widgets_join_apps_summary">Pereiti iš programų stalčiaus į valdiklių stalčių nekeičiant kortelių</string> + <string name="preferences_interface_drawer_scrolling_category">Slinkties juosta</string> + <string name="preferences_interface_drawer_scrolling_transition_effect_title">Perėjimo efektas</string> + <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Slinkimo efektas kai slenkami ekranai</string> + <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Blukinti šoninius puslapius</string> + <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Blukinti šoninius puslapius kai slenkami ekranai</string> <string name="preferences_interface_drawer_indicator_category">Indikatorius</string> - <string name="preferences_interface_drawer_indicator_enable_title">Rodyti lango indikatorių</string> - <string name="preferences_interface_drawer_indicator_enable_summary">Rodyti esamo lango indikatorių apačioje</string> - <string name="preferences_interface_drawer_indicator_fade_title">Blukinti indikatorių</string> - <string name="preferences_interface_drawer_indicator_fade_summary">Blukinti indikatorių perslinkus langą</string> - <string name="preferences_interface_drawer_indicator_position_title">Indikatoriaus vieta</string> - <string name="preferences_interface_drawer_indicator_position_summary">Pasirinkite kurioje vietoje rodyti indikatorių</string> - <string name="preferences_interface_dock_title">Dokas</string> - <string name="preferences_interface_dock_enabled_title">Rodyti doką</string> - <string name="preferences_interface_dock_enabled_summary">Rodyti doką po darbalaukiu</string> - <string name="preferences_interface_dock_pages_title">Dokai</string> - <string name="preferences_interface_dock_pages_summary">Dokų skaičius</string> - <string name="preferences_interface_dock_default_page_title">Numatytasis</string> - <string name="preferences_interface_dock_default_page_summary">Pasirinkite numatytąjį doką</string> + <string name="preferences_interface_drawer_indicator_enable_title">Rodyti puslapio indikatorių</string> + <string name="preferences_interface_drawer_indicator_enable_summary">Rodyti dabartinio puslapio indikatorių ekrano apačioje</string> + <string name="preferences_interface_drawer_indicator_fade_title">Pamažu išblukinti indikatorių</string> + <string name="preferences_interface_drawer_indicator_fade_summary">Pamažu išblukinti indikatorių kai puslapis pakeičiamas</string> + <string name="preferences_interface_drawer_indicator_position_title">Indikatoriaus pozicija</string> + <string name="preferences_interface_drawer_indicator_position_summary">Pasirinkti ar rodyti indikatorių ekrane</string> + <string name="preferences_interface_dock_title">Skydelis</string> + <string name="preferences_interface_dock_enabled_title">Rodyti skydelį</string> + <string name="preferences_interface_dock_enabled_summary">Rodyti skydelį po pagrindiniu ekranu</string> + <string name="preferences_interface_dock_pages_title">Puslapiai</string> + <string name="preferences_interface_dock_pages_summary">Puslapių skaičius skydelyje</string> + <string name="preferences_interface_dock_default_page_title">Numatytas puslapis</string> + <string name="preferences_interface_dock_default_page_summary">Pasirinkti numatytąjį puslapį</string> <string name="preferences_interface_dock_icons_title">Piktogramos</string> - <string name="preferences_interface_dock_icons_summary">Piktogramų kiekis doke</string> - <string name="preferences_interface_dock_icon_scale_title">Piktogramų dydis</string> - <string name="preferences_interface_dock_icon_scale_summary">Keisti piktogramų dydį doke</string> - <string name="preferences_interface_dock_divider_title">Rodyti doko skyriklį</string> - <string name="preferences_interface_dock_divider_summary">Rodo skyriklį tarp darbalaukio ir doko</string> + <string name="preferences_interface_dock_icons_summary">Elementų ir stulpelių skaičius skydelyje</string> + <string name="preferences_interface_dock_hide_icon_labels_title">Slėpti piktogramų pavadinimus</string> + <string name="preferences_interface_dock_hide_icon_labels_summary">Slėpti skydelio piktogramų pavadinimus</string> + <string name="preferences_interface_dock_icon_scale_title">Piktogramos mastelis</string> + <string name="preferences_interface_dock_icon_scale_summary">Piktogramų skydelyje mastelis</string> + <string name="preferences_interface_dock_divider_title">Rodyti skydelio skirtuką</string> + <string name="preferences_interface_dock_divider_summary">Rodyti skirtuką tarp pagrindinio ekrano ir skydelio</string> <string name="preferences_interface_icons_title">Piktogramos</string> - <string name="preferences_interface_general_title">Pagrindiniai</string> - <string name="preferences_interface_general_orientation_title">Automatiškai sukti</string> - <string name="preferences_interface_general_fullscreen_title">Per visą ekraną</string> - <string name="preferences_interface_general_fullscreen_summary">Slepia būsenos juostą</string> + <string name="preferences_interface_general_title">Bendrai</string> + <string name="preferences_interface_general_orientation_title">Automatiškai pasukti ekraną</string> + <string name="preferences_interface_general_lock_workspace_title">Užrakinti ekraną</string> + <string name="preferences_interface_general_lock_workspace_summary">Užrakinti šaukinių ir aplankų pozicijas pagrindiniame ekrane, skydelyje ir programų bei valdiklių stalčiuje</string> + <string name="preferences_interface_general_fullscreen_title">Viso ekrano veiksena</string> + <string name="preferences_interface_general_fullscreen_summary">Slėpti būsenos juostą, kad išplėsti pagrindinį ekraną</string> + <string name="folder_empty_contents_title">Elementų nerasta</string> + <string name="preferences_interface_general_iconpack_title">Piktogramų paketas</string> + <string name="preferences_interface_general_iconpack_summary">Piktogramų paketai pakeičia numatytas programos piktogramas</string> + <string name="dialog_pick_iconpack_title">Pasirinkti piktogramų paketą</string> + <string name="default_iconpack_title">Numatyta</string> + <string name="no_iconpacks_summary">Nėra įdiegtų piktogramų paketų</string> + <string name="effects_standard">Standartinis</string> + <string name="effects_tablet">Planšetė</string> + <string name="effects_zoom_in">Padidinti</string> + <string name="effects_zoom_out">Sumažinti</string> + <string name="effects_rotate_up">Sukti aukštyn</string> + <string name="effects_rotate_down">Sukti žemyn</string> + <string name="effects_cylinder_in">Cilindro vidus</string> + <string name="effects_cylinder_out">Cilindro išorė</string> + <string name="effects_cube_in">Kubo vidus</string> + <string name="effects_cube_out">Kubo išorė</string> + <string name="effects_spin">Sukinys</string> + <string name="effects_flip">Apversti</string> + <string name="effects_stack">Dėklas</string> + <string name="effects_accordion">Akordeonas</string> + <string name="effects_carousel_left">Karuselė kairėje</string> + <string name="effects_carousel_right">Karuselė dešinėje</string> + <string name="live_folder_cling_title">Aktyvūs aplankai</string> + <string name="live_folder_cling_create_folder">Aktyvūs aplankai leidžia programų kūrėjams kurti aplankus su dinaminiu turiniu. Aplanko turinys gali būti pašalintas ilgai spaudžiant vieną elementą. Kitaip nei normalūs aplankai, elementai gali būti pridedami tik programos sukūrusios aplanką.</string> </resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 0c778ae1e..4fad35400 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -191,4 +191,7 @@ Folder contents can be removed with a long press on a single entry. Unlike normal folders, items can only be added by the application creating the folder</string> + <!-- Folder titles --> + <string name="conversations_title">Conversations</string> + <string name="google_title">Google</string> </resources> diff --git a/src/com/cyanogenmod/trebuchet/LauncherProvider.java b/src/com/cyanogenmod/trebuchet/LauncherProvider.java index 00220b183..260a16a6b 100644 --- a/src/com/cyanogenmod/trebuchet/LauncherProvider.java +++ b/src/com/cyanogenmod/trebuchet/LauncherProvider.java @@ -239,6 +239,7 @@ public class LauncherProvider extends ContentProvider { private static final String TAG_ALLAPPS = "allapps"; private static final String TAG_FOLDER = "folder"; private static final String TAG_EXTRA = "extra"; + private static final String TAG_LIVE_FOLDER = "live-folder"; private final Context mContext; private final AppWidgetHost mAppWidgetHost; @@ -358,6 +359,7 @@ public class LauncherProvider extends ContentProvider { final int screenIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.SCREEN); final int cellXIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLX); final int cellYIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLY); + final int receiverIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.RECEIVER); ContentValues[] rows = new ContentValues[c.getCount()]; int i = 0; @@ -376,6 +378,8 @@ public class LauncherProvider extends ContentProvider { values.put(LauncherSettings.Favorites.SCREEN, c.getInt(screenIndex)); values.put(LauncherSettings.Favorites.CELLX, c.getInt(cellXIndex)); values.put(LauncherSettings.Favorites.CELLY, c.getInt(cellYIndex)); + values.put(LauncherSettings.Favorites.RECEIVER, c.getInt(receiverIndex)); + rows[i++] = values; } @@ -654,6 +658,9 @@ public class LauncherProvider extends ContentProvider { } else if (TAG_SHORTCUT.equals(name)) { long id = addUriShortcut(db, values, a); added = id >= 0; + } else if (TAG_LIVE_FOLDER.equals(name)) { + long id = addLiveFolder(db, values, a, packageManager); + added = id >= 0; } else if (TAG_FOLDER.equals(name)) { String title; int titleResId = a.getResourceId(R.styleable.Favorite_title, -1); @@ -772,6 +779,47 @@ public class LauncherProvider extends ContentProvider { } } + private long addLiveFolder(SQLiteDatabase db, ContentValues values, TypedArray a, + PackageManager packageManager) { + long id = -1; + String packageName = a.getString(R.styleable.Favorite_packageName); + String className = a.getString(R.styleable.Favorite_className); + try { + ComponentName cn; + try { + cn = new ComponentName(packageName, className); + packageManager.getReceiverInfo(cn, 0); + } catch (PackageManager.NameNotFoundException nnfe) { + String[] packages = packageManager.currentToCanonicalPackageNames( + new String[] { packageName }); + cn = new ComponentName(packages[0], className); + packageManager.getReceiverInfo(cn, 0); + } + String title; + int titleResId = a.getResourceId(R.styleable.Favorite_title, -1); + if (titleResId != -1) { + title = mContext.getResources().getString(titleResId); + } else { + title = mContext.getResources().getString(R.string.folder_name); + } + values.put(LauncherSettings.Favorites.TITLE, title); + + values.put(Favorites.RECEIVER, cn.toString()); + values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_LIVE_FOLDER); + values.put(Favorites.SPANX, 1); + values.put(Favorites.SPANY, 1); + id = generateNewId(); + values.put(Favorites._ID, id); + if (dbInsertAndCheck(db, TABLE_FAVORITES, null, values) < 0) { + return -1; + } + } catch (PackageManager.NameNotFoundException e) { + Log.w(TAG, "Unable to add favorite: " + packageName + + "/" + className, e); + } + return id; + } + private ComponentName getSearchWidgetProvider() { SearchManager searchManager = (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE); diff --git a/src/com/cyanogenmod/trebuchet/LauncherSettings.java b/src/com/cyanogenmod/trebuchet/LauncherSettings.java index aa52d0480..1b22cfee9 100644 --- a/src/com/cyanogenmod/trebuchet/LauncherSettings.java +++ b/src/com/cyanogenmod/trebuchet/LauncherSettings.java @@ -181,6 +181,12 @@ class LauncherSettings { static final String SPANY = "spanY"; /** + * The receiver component for this item + * <P>Type: STRING</P> + */ + static final String RECEIVER = "receiverComponent"; + + /** * The favorite is a user created folder */ static final int ITEM_TYPE_FOLDER = 2; diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index 5f0cc5aca..ac07d6cf9 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -1114,7 +1114,7 @@ public class Workspace extends PagedView if (updateNow) { mWallpaperScrollX = mWallpaperInterpolator.getCurrX(); mWallpaperScrollY = mWallpaperInterpolator.getCurrY(); - if (!mWallpaperHack && mWindowToken != null) { + if (mWallpaperBitmap == null && mWindowToken != null) { mWallpaperManager.setWallpaperOffsets(mWindowToken, mWallpaperScrollX, mWallpaperScrollY); } } |