commit 04960cd2e5968e83b26f4fbab23713a5d62af2fc
author Chris Wren <cwren@android.com> Thu Mar 13 20:20:01 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 13 20:20:01 2014 +0000
tree 693d4a24d7cdd7ab4a625896effd4062b9163a60
parent 5f179e6eaf78eefe12dce74d37bf3c6fcaad73b7
parent 5160e96698bec4ecd630c81f66e32eb0afb1eaef

Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 62e6f31..cab55c7 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -461,7 +461,8 @@
 
         int startRows = out.rows;
         if (DEBUG) Log.d(TAG, "starting here: " + startRows);
-        String where = Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_APPLICATION;
+        String where = Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_APPLICATION + " OR " +
+                Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_SHORTCUT;
         Cursor cursor = cr.query(Favorites.CONTENT_URI, FAVORITE_PROJECTION,
                 where, null, null);
         Set<String> currentIds = new HashSet<String>(cursor.getCount());