diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-29 17:20:55 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-09-04 08:18:33 -0700 |
| commit | 349426234e8c5a0e5bcf2c8d94dbb9844b5f724a (patch) | |
| tree | 7959007f77fe9293898b72b57b4b28c87b90527e /src/com/android/launcher3/Launcher.java | |
| parent | 6a2c77856f1cfa402363cfbb04b5718b431bbc6e (diff) | |
| download | android_packages_apps_Trebuchet-349426234e8c5a0e5bcf2c8d94dbb9844b5f724a.tar.gz android_packages_apps_Trebuchet-349426234e8c5a0e5bcf2c8d94dbb9844b5f724a.tar.bz2 android_packages_apps_Trebuchet-349426234e8c5a0e5bcf2c8d94dbb9844b5f724a.zip | |
Handling label and icon from SessionInfo.
> The ShortcutInfo stores state as bit flags and not as ints
> Intents of auto-install shortcut are automatically updated
upon installation
> Icons/titles for active sessions are cached in IconCache
Change-Id: I2047849f67d4a8aaf2bc346b58110325bb4807d4
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 83f813dc6..32fed34c5 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); |