From 7bc272a11b701a32d2ed91277341c382cbd84aeb Mon Sep 17 00:00:00 2001 From: Kenny Guy Date: Tue, 24 Jun 2014 10:29:28 +0100 Subject: 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 --- src/com/android/launcher3/Launcher.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/com/android/launcher3/Launcher.java') diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index bf774f9c7..ad501a31c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2744,8 +2744,8 @@ public class Launcher extends Activity // Could be launching some bookkeeping activity startActivity(intent, optsBundle); } else { - launcherApps.startActivityForProfile(intent.getComponent(), user, - intent.getSourceBounds(), optsBundle); + launcherApps.startActivityForProfile(intent.getComponent(), + intent.getSourceBounds(), optsBundle, user); } return true; } catch (SecurityException e) { @@ -4674,9 +4674,7 @@ public class Launcher extends Activity public ItemInfo createShortcutDragInfo(Intent shortcutIntent, CharSequence caption, Bitmap icon, UserHandleCompat user) { - UserManagerCompat userManager = UserManagerCompat.getInstance(this); - String contentDescription = userManager.getBadgedLabelForUser(caption.toString(), user); - return new ShortcutInfo(shortcutIntent, caption, contentDescription, icon, user); + return new ShortcutInfo(shortcutIntent, caption, icon, user); } protected void moveWorkspaceToDefaultScreen() { -- cgit v1.2.3