diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-08 13:48:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 13:48:47 +0000 |
| commit | 028ce83f17b47df5f86789ddbc1904930a034be3 (patch) | |
| tree | fe1093e354685551e028d5fd0dbd97ffa1223d8f | |
| parent | ea1b46065e59e7a78f062b750e03164e09ec5610 (diff) | |
| parent | 0cc5a6562a7910c65ee8ed321b2fdcc055a72917 (diff) | |
| download | android_packages_apps_Trebuchet-028ce83f17b47df5f86789ddbc1904930a034be3.tar.gz android_packages_apps_Trebuchet-028ce83f17b47df5f86789ddbc1904930a034be3.tar.bz2 android_packages_apps_Trebuchet-028ce83f17b47df5f86789ddbc1904930a034be3.zip | |
am 0cc5a656: am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop
* commit '0cc5a6562a7910c65ee8ed321b2fdcc055a72917':
Don't remove content URI shortcuts during restore
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index b44433d8d..616e5366c 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2035,6 +2035,10 @@ public class LauncherModel extends BroadcastReceiver allowMissingTarget = true; // Add the icon on the workspace anyway. } + } else if (cn == null) { + // For shortcuts with no component, keep them as they are + restoredRows.add(id); + restored = false; } } catch (URISyntaxException e) { Launcher.addDumpLog(TAG, |