diff --git a/core/res/res/drawable/default_dream_preview.xml b/core/res/res/drawable/default_dream_preview.xml
new file mode 100644
index 0000000000000..bf4a04b30f193
--- /dev/null
+++ b/core/res/res/drawable/default_dream_preview.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 4e77563602ee2..6bc35ec2fffeb 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2221,6 +2221,7 @@
+
diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
index 6b9b75011f5b3..aed2ec10e9245 100644
--- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
+++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
@@ -52,6 +52,7 @@ import java.util.List;
public class DreamBackend {
private static final String TAG = "DreamBackend";
private static final boolean DEBUG = false;
+ private final Drawable mDreamPreviewDefault;
public static class DreamInfo {
public CharSequence caption;
@@ -111,6 +112,8 @@ public class DreamBackend {
.getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
mDreamsActivatedOnDockByDefault = mContext.getResources()
.getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
+ mDreamPreviewDefault = mContext.getResources().getDrawable(
+ com.android.internal.R.drawable.default_dream_preview);
}
public List getDreamInfos() {
@@ -133,11 +136,11 @@ public class DreamBackend {
dreamInfo.isActive = dreamInfo.componentName.equals(activeDream);
final DreamMetadata dreamMetadata = getDreamMetadata(pm, resolveInfo);
- if (dreamMetadata != null) {
- dreamInfo.settingsComponentName = dreamMetadata.mSettingsActivity;
- dreamInfo.previewImage = dreamMetadata.mPreviewImage;
+ dreamInfo.settingsComponentName = dreamMetadata.mSettingsActivity;
+ dreamInfo.previewImage = dreamMetadata.mPreviewImage;
+ if (dreamInfo.previewImage == null) {
+ dreamInfo.previewImage = mDreamPreviewDefault;
}
-
dreamInfos.add(dreamInfo);
}
Collections.sort(dreamInfos, mComparator);