diff options
author | Chris Wren <cwren@android.com> | 2014-03-13 20:20:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-13 20:20:01 +0000 |
commit | 04960cd2e5968e83b26f4fbab23713a5d62af2fc (patch) | |
tree | 693d4a24d7cdd7ab4a625896effd4062b9163a60 | |
parent | 5f179e6eaf78eefe12dce74d37bf3c6fcaad73b7 (diff) | |
parent | 5160e96698bec4ecd630c81f66e32eb0afb1eaef (diff) | |
download | android_packages_apps_Trebuchet-04960cd2e5968e83b26f4fbab23713a5d62af2fc.tar.gz android_packages_apps_Trebuchet-04960cd2e5968e83b26f4fbab23713a5d62af2fc.tar.bz2 android_packages_apps_Trebuchet-04960cd2e5968e83b26f4fbab23713a5d62af2fc.zip |
Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly
-rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index 62e6f3102..cab55c79e 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -461,7 +461,8 @@ public class LauncherBackupHelper implements BackupHelper { 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()); |