summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/trebuchet/Launcher.java
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-03-20 19:27:17 +0300
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-03-20 19:27:17 +0300
commite4aada67979eb45f38aa8e1f755aea4202b70981 (patch)
tree009383b2315d3a80561769ff6ba113e6c6f18e3b /src/com/cyanogenmod/trebuchet/Launcher.java
parente903f8b68fd1c0be54e73b12d340e585ddb586ca (diff)
parent64c615fecf84b7e7ecc094a2cc91b306268c1a2d (diff)
downloadandroid_packages_apps_Trebuchet-e4aada67979eb45f38aa8e1f755aea4202b70981.tar.gz
android_packages_apps_Trebuchet-e4aada67979eb45f38aa8e1f755aea4202b70981.tar.bz2
android_packages_apps_Trebuchet-e4aada67979eb45f38aa8e1f755aea4202b70981.zip
Merge "Workspace: Cleanup hide icon labels" into ics
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/Launcher.java')
-rw-r--r--src/com/cyanogenmod/trebuchet/Launcher.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 63e6c9085..c565207b8 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -862,8 +862,8 @@ public final class Launcher extends Activity
View createShortcut(int layoutResId, ViewGroup parent, ShortcutInfo info) {
BubbleTextView favorite = (BubbleTextView) mInflater.inflate(layoutResId, parent, false);
favorite.applyFromShortcutInfo(info, mIconCache);
- if (mHideIconLabels){
- favorite.setText(null);
+ if (mHideIconLabels) {
+ favorite.setTextVisible(false);
}
favorite.setOnClickListener(this);
return favorite;
@@ -1625,6 +1625,9 @@ public final class Launcher extends Activity
// Create the view
FolderIcon newFolder =
FolderIcon.fromXml(R.layout.folder_icon, this, layout, folderInfo, mIconCache);
+ if (mHideIconLabels) {
+ newFolder.setTextVisible(false);
+ }
mWorkspace.addInScreen(newFolder, container, screen, cellX, cellY, 1, 1,
isWorkspaceLocked());
return newFolder;
@@ -3131,6 +3134,9 @@ public final class Launcher extends Activity
FolderIcon newFolder = FolderIcon.fromXml(R.layout.folder_icon, this,
(ViewGroup) workspace.getChildAt(workspace.getCurrentPage()),
(FolderInfo) item, mIconCache);
+ if (!mHideIconLabels) {
+ newFolder.setTextVisible(false);
+ }
workspace.addInScreen(newFolder, item.container, item.screen, item.cellX,
item.cellY, 1, 1, false);
break;