Merge "Fixing Intrinsic dimensions of FastBitmapDrawable" into ub-now-porkchop
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3633c8c..90b33c5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -167,18 +167,18 @@
<!-- Intent received used to install shortcuts from other applications -->
<receiver
android:name="com.android.launcher3.InstallShortcutReceiver"
- android:permission="com.android.launcher3.permission.INSTALL_SHORTCUT">
+ android:permission="com.android.launcher.permission.INSTALL_SHORTCUT">
<intent-filter>
- <action android:name="com.android.launcher3.action.INSTALL_SHORTCUT" />
+ <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
</intent-filter>
</receiver>
<!-- Intent received used to uninstall shortcuts from other applications -->
<receiver
android:name="com.android.launcher3.UninstallShortcutReceiver"
- android:permission="com.android.launcher3.permission.UNINSTALL_SHORTCUT">
+ android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT">
<intent-filter>
- <action android:name="com.android.launcher3.action.UNINSTALL_SHORTCUT" />
+ <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />
</intent-filter>
</receiver>
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b44433d..616e536 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2035,6 +2035,10 @@
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,