summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2014-07-02 14:02:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-01 17:46:08 +0000
commite10abafa50c01060f96d1464e81929bdec7f2c27 (patch)
treed0b838dc905e648d28e4b9daa5f12e58b80b0a51 /src/com/android/launcher3/Workspace.java
parent5ba21b6024ee8a3d4bdb2acad6fe30dfcf5cb3cd (diff)
parentc2bd8101b8e26b9ebb2c079ae6867229dad3f196 (diff)
downloadandroid_packages_apps_Trebuchet-e10abafa50c01060f96d1464e81929bdec7f2c27.tar.gz
android_packages_apps_Trebuchet-e10abafa50c01060f96d1464e81929bdec7f2c27.tar.bz2
android_packages_apps_Trebuchet-e10abafa50c01060f96d1464e81929bdec7f2c27.zip
Merge "Revert "Revert Cls stopping now-master running on googlefood"" into ub-now-master
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 78454e963..48795af13 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4781,6 +4781,7 @@ public class Workspace extends SmoothPagedView
shortcutInfo.restore();
shortcutInfo.updateIcon(mIconCache);
shortcutInfo.title = appInfo.title.toString();
+ shortcutInfo.contentDescription = appInfo.contentDescription;
shortcut.applyFromShortcutInfo(shortcutInfo, mIconCache);
}
}