summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Folder.java
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2014-06-24 10:29:28 +0100
committerKenny Guy <kennyguy@google.com>2014-06-24 11:43:19 +0100
commit7bc272a11b701a32d2ed91277341c382cbd84aeb (patch)
treedd38c26e211acf7988f4cdccdca9f46958b56044 /src/com/android/launcher3/Folder.java
parent01453e855fa87ee19f61223b2b1a6965071ee95a (diff)
downloadandroid_packages_apps_Trebuchet-7bc272a11b701a32d2ed91277341c382cbd84aeb.tar.gz
android_packages_apps_Trebuchet-7bc272a11b701a32d2ed91277341c382cbd84aeb.tar.bz2
android_packages_apps_Trebuchet-7bc272a11b701a32d2ed91277341c382cbd84aeb.zip
Revert Cls stopping now-master running on googlefood
This reverts commits 01453e855fa87ee19f61223b2b1a6965071ee95a. and 242bbe1b72e4978dde8a662d164cd186305e14a7. "Add content description to bagded icons." "Remove reflection now we are building against L" Bug: 15833449 Change-Id: I81a5316f5619a9cd3b6ab9fd03b2ba96657b7f68
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r--src/com/android/launcher3/Folder.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index af4a1776c..e900c2b5a 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -571,9 +571,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
textView.setCompoundDrawables(null,
Utilities.createIconDrawable(item.getIcon(mIconCache)), null, null);
textView.setText(item.title);
- if (item.contentDescription != null) {
- textView.setContentDescription(item.contentDescription);
- }
textView.setTag(item);
textView.setTextColor(getResources().getColor(R.color.folder_items_text_color));
textView.setShadowsEnabled(false);