commit 6e8246dcb6d7014fb2ae193f08c647ecd6dc784b
author Chris Wren <cwren@android.com> Thu Mar 13 20:25:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 13 20:25:32 2014 +0000
tree dc05b2647afeb3d5b5c5d5a48849f7934e64206d
parent 656c90c18bbdd75244ebe46fae578e9df24c0607
parent 47bc68d27dcafd58dd5ff06b5858c3e3fe089d91

am 47bc68d2: am 04960cd2: Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly

* commit '47bc68d27dcafd58dd5ff06b5858c3e3fe089d91':
  also backup icon assets for shortcuts.

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());