diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-05 07:42:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 07:42:32 +0000 |
| commit | 1c13ff569170bec075ab9961fbc0eb1ca395696b (patch) | |
| tree | 8291513e3e8c9a072e23cce1f4dd9f0c95fb86ae /src/com/android/launcher3/Launcher.java | |
| parent | 66205ce9ceb46a821c9a2d93745226d67f1b119a (diff) | |
| parent | 349426234e8c5a0e5bcf2c8d94dbb9844b5f724a (diff) | |
| download | android_packages_apps_Trebuchet-1c13ff569170bec075ab9961fbc0eb1ca395696b.tar.gz android_packages_apps_Trebuchet-1c13ff569170bec075ab9961fbc0eb1ca395696b.tar.bz2 android_packages_apps_Trebuchet-1c13ff569170bec075ab9961fbc0eb1ca395696b.zip | |
Merge "Handling label and icon from SessionInfo." into ub-now-porkchop
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ffce116b9..309ab46c9 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2600,9 +2600,11 @@ public class Launcher extends Activity } // Check for abandoned promise - if (shortcut.isAbandoned() && v instanceof BubbleTextView) { + if ((v instanceof BubbleTextView) + && shortcut.isPromise() + && !shortcut.hasStatusFlag(ShortcutInfo.FLAG_INSTALL_SESSION_ACTIVE)) { showBrokenAppInstallDialog( - shortcut.getRestoredIntent().getComponent().getPackageName(), + shortcut.getTargetComponent().getPackageName(), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { startAppShortcutOrInfoActivity(v); |