Merge "Fail more gracefully when wallpaper thumbs are missing."

6da2eb9c · Daniel Sandler · Android (Google) Code Review · 2a5b0808 · 83682f1b · 6da2eb9c
Commit 6da2eb9c authored 10 years ago by Daniel Sandler Committed by Android (Google) Code Review 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

src/com/android/launcher2/WallpaperChooserDialogFragment.java ...com/android/launcher2/WallpaperChooserDialogFragment.java +8 -5

No files found.
--- a/src/com/android/launcher2/WallpaperChooserDialogFragment.java
+++ b/src/com/android/launcher2/WallpaperChooserDialogFragment.java
@@ -209,14 +209,17 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
        for (String extra : extras) {
            int res = resources.getIdentifier(extra, "drawable", packageName);
            if (res != 0) {
-                final int thumbRes = resources.getIdentifier(extra + "_small",
+                int thumbRes = resources.getIdentifier(extra + "_small",
                        "drawable", packageName);

-                if (thumbRes != 0) {
-                    mThumbs.add(thumbRes);
-                    mImages.add(res);
-                    // Log.d(TAG, "add: [" + packageName + "]: " + extra + " (" + res + ")");
+                //Log.d(TAG, "add: [" + packageName + "]: " + extra + " (res=" + res + " thumb=" + thumbRes + ")");
+                if (thumbRes == 0) {
+                    Log.w(TAG, "warning: built-in wallpaper " + extra
+                            + " without " + extra + "_thumb");
+                    thumbRes = R.mipmap.ic_launcher_wallpaper;
                }
+                mThumbs.add(thumbRes);
+                mImages.add(res);
            }
        }
    }