summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-es/cm_strings.xml5
-rw-r--r--res/values-pt/cm_strings.xml5
-rw-r--r--res/values-sk/cm_strings.xml5
-rwxr-xr-xsrc/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java20
-rw-r--r--src/com/cyanogenmod/trebuchet/Folder.java1
-rw-r--r--src/com/cyanogenmod/trebuchet/LiveFolderInfo.java3
-rw-r--r--src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java3
7 files changed, 29 insertions, 13 deletions
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 35916ba84..0701fc2a9 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -120,6 +120,11 @@
<string name="preferences_interface_general_fullscreen_title">Modo pantalla completa</string>
<string name="preferences_interface_general_fullscreen_summary">Ocultar la barra de estado para extender la pantalla de inicio</string>
<string name="folder_empty_contents_title">No hay elementos</string>
+ <string name="preferences_interface_general_iconpack_title">Paquete de iconos</string>
+ <string name="preferences_interface_general_iconpack_summary">Los paquetes de iconos reemplazan los iconos predeterminados de las aplicaciones</string>
+ <string name="dialog_pick_iconpack_title">Escoger paquete de iconos</string>
+ <string name="default_iconpack_title">Iconos por defecto</string>
+ <string name="no_iconpacks_summary">No hay paquetes de iconos instalados</string>
<string name="effects_standard">Estándar</string>
<string name="effects_tablet">Tablet</string>
<string name="effects_zoom_in">Zoom entrante</string>
diff --git a/res/values-pt/cm_strings.xml b/res/values-pt/cm_strings.xml
index 31538ff55..893acfe87 100644
--- a/res/values-pt/cm_strings.xml
+++ b/res/values-pt/cm_strings.xml
@@ -138,4 +138,9 @@
<string name="live_folder_cling_title">Pastas dinâmicas</string>
<string name="live_folder_cling_create_folder">Pastas dinâmicas permitem os desenvolvedores de aplicativos criarem pastas com conteúdo dinâmico.
O conteúdo das pastas podem ser removido com um toque desde que seja apenas uma entrada. Ao contrário das pastas normais, os itens só podem ser adicionados pelos aplicativos que criaram as pastas</string>
+ <string name="preferences_interface_general_iconpack_title">Pacote de ícones</string>
+ <string name="preferences_interface_general_iconpack_summary">Os pacotes de ícones substituem os ícones padrões das aplicações</string>
+ <string name="dialog_pick_iconpack_title">Escolhe o pacote de ícones</string>
+ <string name="default_iconpack_title">Ícones padrões</string>
+ <string name="no_iconpacks_summary">Nenhum pacote de ícones instalado</string>
</resources> \ No newline at end of file
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index b966f3fe6..4c47392c7 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -139,4 +139,9 @@
<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="default_iconpack_title">Predvolené ikony</string>
+ <string name="no_iconpacks_summary">Nie sú nainštalované žiadne balíky ikôn</string>
</resources>
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
index 9ca1882ab..5505855be 100755
--- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
@@ -1127,15 +1127,19 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
private void updateCurrentTab(int currentPage) {
AppsCustomizeTabHost tabHost = getTabHost();
if (tabHost != null) {
- String tag = tabHost.getCurrentTabTag();
- if (tag != null) {
- if (currentPage >= mNumAppsPages &&
- !tag.equals(tabHost.getTabTagForContentType(ContentType.Widgets))) {
- tabHost.setCurrentTabFromContent(ContentType.Widgets);
- } else if (currentPage < mNumAppsPages &&
- !tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) {
- tabHost.setCurrentTabFromContent(ContentType.Applications);
+ if (mJoinWidgetsApps) {
+ String tag = tabHost.getCurrentTabTag();
+ if (tag != null) {
+ if (currentPage >= mNumAppsPages &&
+ !tag.equals(tabHost.getTabTagForContentType(ContentType.Widgets))) {
+ tabHost.setCurrentTabFromContent(ContentType.Widgets);
+ } else if (currentPage < mNumAppsPages &&
+ !tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) {
+ tabHost.setCurrentTabFromContent(ContentType.Applications);
+ }
}
+ } else {
+ tabHost.setCurrentTabFromContent(mContentType);
}
}
}
diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java
index 80bda330d..6d3a2f64d 100644
--- a/src/com/cyanogenmod/trebuchet/Folder.java
+++ b/src/com/cyanogenmod/trebuchet/Folder.java
@@ -1154,6 +1154,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
public void onAllItemsRemoved() {
mItemsInvalidated = true;
mContent.removeAllViews();
+ setupContentForNumItems(getItemCount());
replaceFolderWithFinalItem();
}
diff --git a/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java b/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java
index 19ce90613..abd7c2969 100644
--- a/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java
+++ b/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java
@@ -1,7 +1,6 @@
package com.cyanogenmod.trebuchet;
import java.util.ArrayList;
-import java.util.Iterator;
import org.cyanogenmod.support.ui.LiveFolder;
@@ -26,7 +25,6 @@ import android.text.TextUtils;
class LiveFolderInfo extends FolderInfo {
ComponentName receiver;
- long lastUpdate;
Intent.ShortcutIconResource iconResource;
LiveFolderInfo() {
@@ -68,7 +66,6 @@ class LiveFolderInfo extends FolderInfo {
}
public void populateWithItems(Context ctx, ArrayList<LiveFolder.Item> items) {
- lastUpdate = System.currentTimeMillis();
removeAll();
Bitmap icon = null;
for (LiveFolder.Item item : items) {
diff --git a/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java b/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java
index 46853bba9..056341346 100644
--- a/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java
+++ b/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java
@@ -49,8 +49,7 @@ public class LiveFoldersReceiver extends BroadcastReceiver {
// Verify item list
ArrayList<LiveFolder.Item> items = intent.getParcelableArrayListExtra(
FOLDER_ENTRIES_EXTRA);
- if (items == null || items.isEmpty()) {
- Log.e(TAG, "Cannot populate with empty items");
+ if (items == null) {
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 05:00:33 +0000